Image create for different jvm version

- Now building for jdk8 and jdk11 with a specific postfix - Usual version tag is changed to have jdk11 - Fixes #4585
spring-cloud · Jun 18, 2021 · 8b0cb2a · 8b0cb2a
1 parent e2d1e57
commit 8b0cb2a
Show file tree

Hide file tree

Showing 4 changed files with 64 additions and 8 deletions.
diff --git a/.github/workflows/build-snapshot-worker.yml b/.github/workflows/build-snapshot-worker.yml
@@ -71,11 +71,19 @@ jobs:
         pack build \
           --path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
           --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
-          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-server:$TAG
+          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-server:$TAG-jdk8
+        pack build \
+          --path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
+          --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
+          --env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-server:$TAG-jdk11
+        pack build \
+          --path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
+          --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
+          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk8
         pack build \
           --path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
           --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
-          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
+          --env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11
 
     # docker hub login
     - uses: docker/login-action@v1
@@ -88,6 +96,12 @@ jobs:
       env:
         TAG: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
       run: |
+        docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk8
+        docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk11
+        docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk8
+        docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11
+        docker tag springcloud/spring-cloud-dataflow-server:$TAG-jdk11 springcloud/spring-cloud-dataflow-server:$TAG
+        docker tag springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
         docker push springcloud/spring-cloud-dataflow-server:$TAG
         docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
 

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -64,11 +64,19 @@ jobs:
         pack build \
           --path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
           --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
-          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-server:$TAG
+          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-server:$TAG-jdk8
+        pack build \
+          --path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
+          --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
+          --env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-server:$TAG-jdk11
+        pack build \
+          --path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
+          --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
+          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk8
         pack build \
           --path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
           --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
-          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
+          --env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11
 
     # docker hub login
     - uses: docker/login-action@v1
@@ -81,6 +89,12 @@ jobs:
       env:
         TAG: ${{ env.spring_cloud_dataflow_version }}
       run: |
+        docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk8
+        docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk11
+        docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk8
+        docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11
+        docker tag springcloud/spring-cloud-dataflow-server:$TAG-jdk11 springcloud/spring-cloud-dataflow-server:$TAG
+        docker tag springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
         docker push springcloud/spring-cloud-dataflow-server:$TAG
         docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
 

diff --git a/.github/workflows/milestone-worker.yml b/.github/workflows/milestone-worker.yml
@@ -161,11 +161,19 @@ jobs:
         pack build \
           --path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
           --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
-          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-server:$TAG
+          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-server:$TAG-jdk8
+        pack build \
+          --path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
+          --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
+          --env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-server:$TAG-jdk11
+        pack build \
+          --path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
+          --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
+          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk8
         pack build \
           --path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
           --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
-          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
+          --env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11
 
     # docker hub login
     - uses: docker/login-action@v1
@@ -178,6 +186,12 @@ jobs:
       env:
         TAG: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
       run: |
+        docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk8
+        docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk11
+        docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk8
+        docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11
+        docker tag springcloud/spring-cloud-dataflow-server:$TAG-jdk11 springcloud/spring-cloud-dataflow-server:$TAG
+        docker tag springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
         docker push springcloud/spring-cloud-dataflow-server:$TAG
         docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
 

diff --git a/.github/workflows/release-worker.yml b/.github/workflows/release-worker.yml
@@ -160,11 +160,19 @@ jobs:
         pack build \
           --path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
           --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
-          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-server:$TAG
+          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-server:$TAG-jdk8
+        pack build \
+          --path spring-cloud-dataflow-server/target/spring-cloud-dataflow-server-$TAG.jar \
+          --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
+          --env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-server:$TAG-jdk11
+        pack build \
+          --path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
+          --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
+          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk8
         pack build \
           --path spring-cloud-dataflow-composed-task-runner/target/spring-cloud-dataflow-composed-task-runner-$TAG.jar \
           --builder gcr.io/paketo-buildpacks/builder:0.1.99-base \
-          --env BP_JVM_VERSION=8 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
+          --env BP_JVM_VERSION=11 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11
 
     # docker hub login
     - uses: docker/login-action@v1
@@ -177,6 +185,12 @@ jobs:
       env:
         TAG: ${{ env.BUILD_ZOO_HANDLER_spring_cloud_dataflow_version }}
       run: |
+        docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk8
+        docker push springcloud/spring-cloud-dataflow-server:$TAG-jdk11
+        docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk8
+        docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11
+        docker tag springcloud/spring-cloud-dataflow-server:$TAG-jdk11 springcloud/spring-cloud-dataflow-server:$TAG
+        docker tag springcloud/spring-cloud-dataflow-composed-task-runner:$TAG-jdk11 springcloud/spring-cloud-dataflow-composed-task-runner:$TAG
         docker push springcloud/spring-cloud-dataflow-server:$TAG
         docker push springcloud/spring-cloud-dataflow-composed-task-runner:$TAG