feat(Linux): switch supported architectures to GA Temurin jdk21 images

jenkinsci · Oct 22, 2023 · 9bc125c · 9bc125c
1 parent 735594e
commit 9bc125c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 41 deletions.
diff --git a/alpine/Dockerfile-jdk21 b/alpine/Dockerfile-jdk21
diff --git a/debian/Dockerfile-jdk21 → debian/preview/Dockerfile b/debian/Dockerfile-jdk21 → debian/preview/Dockerfile
diff --git a/docker-bake.hcl b/docker-bake.hcl
@@ -86,16 +86,16 @@ target "alpine_jdk17" {
 }
 
 target "alpine_jdk21" {
-  dockerfile = "alpine/Dockerfile-jdk21"
+  dockerfile = "alpine/Dockerfile"
   context    = "."
   args = {
     JAVA_MAJOR_VERSION = "21"
     version            = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
-    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine-jdk21-preview" : "",
-    "${REGISTRY}/${JENKINS_REPO}:alpine-jdk21-preview",
-    "${REGISTRY}/${JENKINS_REPO}:latest-alpine-jdk21-preview",
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-alpine-jdk21" : "",
+    "${REGISTRY}/${JENKINS_REPO}:alpine-jdk21",
+    "${REGISTRY}/${JENKINS_REPO}:latest-alpine-jdk21",
   ]
   platforms = ["linux/amd64", "linux/arm64"]
 }
@@ -133,7 +133,22 @@ target "debian_jdk17" {
 }
 
 target "debian_jdk21" {
-  dockerfile = "debian/Dockerfile-jdk21"
+  dockerfile = "debian/Dockerfile"
+  context    = "."
+  args = {
+    JAVA_MAJOR_VERSION = "21"
+    version            = "${PARENT_IMAGE_VERSION}"
+  }
+  tags = [
+    equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-jdk21" : "",
+    "${REGISTRY}/${JENKINS_REPO}:jdk21",
+    "${REGISTRY}/${JENKINS_REPO}:latest-jdk21",
+  ]
+  platforms = ["linux/amd64", "linux/arm64"]
+}
+
+target "debian_jdk21_preview" {
+  dockerfile = "debian/preview/Dockerfile"
   context    = "."
   args = {
     JAVA_MAJOR_VERSION = "21"
@@ -144,5 +159,5 @@ target "debian_jdk21" {
     "${REGISTRY}/${JENKINS_REPO}:jdk21-preview",
     "${REGISTRY}/${JENKINS_REPO}:latest-jdk21-preview",
   ]
-  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
+  platforms = ["linux/ppc64le", "linux/s390x", "linux/arm/v7"]
 }