Split Dockerfile

junit-team · Dec 1, 2019 · 80763cd · 80763cd
1 parent 4ab81e9
commit 80763cd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/.github/workflows/dockerimage.yml b/.github/workflows/dockerimage.yml
@@ -11,6 +11,7 @@ jobs:
         name: junitteam/build
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
+        workdir: base
     - name: JDK 12
       uses: elgohr/Publish-Docker-Github-Action@cade1bc
       env:
@@ -19,6 +20,7 @@ jobs:
         name: junitteam/build:12
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
+        workdir: extended
         buildargs: ADDITIONAL_JDK_VERSION
     - name: JDK 13
       uses: elgohr/Publish-Docker-Github-Action@cade1bc
@@ -28,6 +30,7 @@ jobs:
         name: junitteam/build:13
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
+        workdir: extended
         buildargs: ADDITIONAL_JDK_VERSION
     - name: JDK 14
       uses: elgohr/Publish-Docker-Github-Action@cade1bc
@@ -37,4 +40,5 @@ jobs:
         name: junitteam/build:14
         username: ${{ secrets.DOCKER_USERNAME }}
         password: ${{ secrets.DOCKER_PASSWORD }}
+        workdir: extended
         buildargs: ADDITIONAL_JDK_VERSION
diff --git a/Dockerfile → base/Dockerfile b/Dockerfile → base/Dockerfile
@@ -28,13 +28,3 @@ RUN bash -c ". $SDKMAN_DIR/bin/sdkman-init.sh \
 ENV JDK8=$SDKMAN_DIR/candidates/java/$JDK8_VERSION \
     JAVA_HOME=$SDKMAN_DIR/candidates/java/$DEFAULT_JDK_VERSION \
     PATH="$JAVA_HOME/bin:${PATH}"
-
-ARG ADDITIONAL_JDK_VERSION=$DEFAULT_JDK_VERSION
-
-RUN bash -c ". $SDKMAN_DIR/bin/sdkman-init.sh \
-    && sdk install java $ADDITIONAL_JDK_VERSION \
-    && sdk default java $DEFAULT_JDK_VERSION \
-    && sdk flush archives \
-    && sdk flush temp"
-
-ENV ADDITIONAL_JDK=$SDKMAN_DIR/candidates/java/$ADDITIONAL_JDK_VERSION
diff --git a/extended/Dockerfile b/extended/Dockerfile
@@ -0,0 +1,11 @@
+FROM junitteam/build
+
+ARG ADDITIONAL_JDK_VERSION
+
+RUN bash -c ". $SDKMAN_DIR/bin/sdkman-init.sh \
+    && sdk install java $ADDITIONAL_JDK_VERSION \
+    && sdk default java $DEFAULT_JDK_VERSION \
+    && sdk flush archives \
+    && sdk flush temp"
+
+ENV ADDITIONAL_JDK=$SDKMAN_DIR/candidates/java/$ADDITIONAL_JDK_VERSION