chore: factorise jdk in docker-bake.hcl #804
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
lemeurherve
force-pushed
the
factorise-docker-bake
branch
from
67f79d1 to
a502328
Compare
timja
previously approved these changes
May 9, 2024
lemeurherve
force-pushed
the
factorise-docker-bake
branch
from
a502328 to
20a17d3
Compare
lemeurherve
force-pushed
the
factorise-docker-bake
branch
from
20a17d3 to
7246fce
Compare
timja
previously approved these changes
May 9, 2024
lemeurherve
commented
May 15, 2024
Comment on lines
+229
to
245
| target "agent_archlinux_jdk11" { | ||
| dockerfile = "archlinux/Dockerfile" | ||
| context = "." | ||
| args = { | ||
| JAVA_VERSION = JAVA21_VERSION | ||
| VERSION = REMOTING_VERSION | ||
| DEBIAN_RELEASE = DEBIAN_RELEASE | ||
| JAVA_VERSION = JAVA11_VERSION | ||
| VERSION = REMOTING_VERSION | ||
| } | ||
| tags = [ | ||
| equal(ON_TAG, "true") ? "${REGISTRY}/${orgrepo(type)}:${REMOTING_VERSION}-${BUILD_NUMBER}-jdk21" : "", | ||
| "${REGISTRY}/${orgrepo(type)}:bookworm-jdk21", | ||
| "${REGISTRY}/${orgrepo(type)}:jdk21", | ||
| "${REGISTRY}/${orgrepo(type)}:latest-bookworm-jdk21", | ||
| "${REGISTRY}/${orgrepo(type)}:latest-jdk21", | ||
| equal(ON_TAG, "true") ? "${REGISTRY}/${orgrepo("agent")}:${REMOTING_VERSION}-${BUILD_NUMBER}-archlinux" : "", | ||
| equal(ON_TAG, "true") ? "${REGISTRY}/${orgrepo("agent")}:${REMOTING_VERSION}-${BUILD_NUMBER}-archlinux-jdk11" : "", | ||
| "${REGISTRY}/${orgrepo("agent")}:archlinux", | ||
| "${REGISTRY}/${orgrepo("agent")}:latest-archlinux", | ||
| "${REGISTRY}/${orgrepo("agent")}:archlinux-jdk11", | ||
| "${REGISTRY}/${orgrepo("agent")}:latest-archlinux-jdk11", | ||
| ] | ||
| platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"] | ||
| platforms = ["linux/amd64"] | ||
| } |
There was a problem hiding this comment.
This block has just been moved at the bottom with the other special Debian 21 preview image definition, unchanged.
timja
approved these changes
May 16, 2024
dduportal
approved these changes
May 23, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR factorises the JDK in docker bake file, resulting in a more concise definition of images and ensuring tagging consistency, with one block defining Alpine images, another defining Debian images.
Special Debian 21 preview image and Archlinux JDK11 images left untouched.
Note that we can still target a single image even with this factorisation:
Similar to:
Testing done
Verified that the output of
docker buildx bake --file docker-bake.hcl linux --printwithON_TAG=trueis equivalent as before:Before
After
Submitter checklist