Skip to content

Commit

Permalink
Revert "keep jdk21-preview for architectures unsupported by eclipse-t…
Browse files Browse the repository at this point in the history
…emurin:21 image" "also remove linux-s390x for jdk21" "remove linux-arm32 and linux-ppc64le architectures for jdk21, unavailable in eclipse-temurin images"

This reverts commits bce36e2, d154f2e and a900d2d
  • Loading branch information
lemeurherve committed Oct 17, 2023
1 parent 05c300e commit 3a9d480
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 113 deletions.
91 changes: 0 additions & 91 deletions debian/21/Dockerfile

This file was deleted.

27 changes: 5 additions & 22 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,22 @@ group "linux-arm32" {
targets = [
"debian_jdk11",
"debian_jdk17",
"debian_jdk21_preview"
"debian_jdk21"
]
}

group "linux-s390x" {
targets = [
"debian_jdk11",
"debian_jdk21_preview"
"debian_jdk21"
]
}

group "linux-ppc64le" {
targets = [
"debian_jdk11",
"debian_jdk17",
"debian_jdk21_preview"
"debian_jdk21"
]
}

Expand Down Expand Up @@ -212,6 +212,7 @@ target "debian_jdk17" {
platforms = ["linux/amd64", "linux/arm64", "linux/arm/v7", "linux/ppc64le"]
}


target "debian_jdk21" {
dockerfile = "debian/Dockerfile"
context = "."
Expand All @@ -227,23 +228,5 @@ target "debian_jdk21" {
"${REGISTRY}/${JENKINS_REPO}:latest-bookworm-jdk21",
"${REGISTRY}/${JENKINS_REPO}:latest-jdk21",
]
platforms = ["linux/amd64", "linux/arm64"]
}

target "debian_jdk21_preview" {
dockerfile = "debian/21/Dockerfile"
context = "."
args = {
JAVA_VERSION = JAVA21_VERSION
VERSION = REMOTING_VERSION
DEBIAN_RELEASE = DEBIAN_RELEASE
}
tags = [
equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${REMOTING_VERSION}-${BUILD_NUMBER}-jdk21-preview" : "",
"${REGISTRY}/${JENKINS_REPO}:bookworm-jdk21-preview",
"${REGISTRY}/${JENKINS_REPO}:jdk21-preview",
"${REGISTRY}/${JENKINS_REPO}:latest-bookworm-jdk21-preview",
"${REGISTRY}/${JENKINS_REPO}:latest-jdk21-preview",
]
platforms = ["linux/ppc64le", "linux/s390x", "linux/arm/v7"]
platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x", "linux/arm/v7"]
}

0 comments on commit 3a9d480

Please sign in to comment.