chore: add tags functions to docker bake #944

lemeurherveCB · 2025-03-02T12:29:25Z

This PR adds linux_tags and windows_tags functions to regroup Docker image tags definition so we don't have to change every target block when introducing a new JDK, and to avoid errors and/or inconsistencies.

It takes in account JDK in preview so we don't have to deal with it everywhere.

Testing done

With #945, compared the output of make show-linux and make show-windows from the primary branch and from this PR branch, no change, same results.

ON_TAG=true BUILD_NUMBER=3 make show-linux | jq -r ".target | .[].tags | .[]" | sort
ON_TAG=true BUILD_NUMBER=3 make show-windows | jq -r ".target | .[].tags | .[]" | sort

Also checked the output when adding '25' to the jdks_to_build list to ensure the work done by @gounthar in #939 could use it without issue:

Linux tags

docker.io/jenkins/agent:3283.v92c105e0f819-3
docker.io/jenkins/agent:3283.v92c105e0f819-3-alpine
docker.io/jenkins/agent:3283.v92c105e0f819-3-alpine-jdk17
docker.io/jenkins/agent:3283.v92c105e0f819-3-alpine-jdk21
docker.io/jenkins/agent:3283.v92c105e0f819-3-alpine-jdk25-preview
docker.io/jenkins/agent:3283.v92c105e0f819-3-alpine3.21
docker.io/jenkins/agent:3283.v92c105e0f819-3-alpine3.21-jdk17
docker.io/jenkins/agent:3283.v92c105e0f819-3-alpine3.21-jdk21
docker.io/jenkins/agent:3283.v92c105e0f819-3-alpine3.21-jdk25-preview
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk17
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk21
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk25-preview
docker.io/jenkins/agent:3283.v92c105e0f819-3-rhel-ubi9
docker.io/jenkins/agent:3283.v92c105e0f819-3-rhel-ubi9-jdk17
docker.io/jenkins/agent:3283.v92c105e0f819-3-rhel-ubi9-jdk21
docker.io/jenkins/agent:3283.v92c105e0f819-3-rhel-ubi9-jdk25-preview
docker.io/jenkins/agent:alpine
docker.io/jenkins/agent:alpine-jdk17
docker.io/jenkins/agent:alpine-jdk21
docker.io/jenkins/agent:alpine-jdk25-preview
docker.io/jenkins/agent:alpine3.21
docker.io/jenkins/agent:alpine3.21-jdk17
docker.io/jenkins/agent:alpine3.21-jdk21
docker.io/jenkins/agent:alpine3.21-jdk25-preview
docker.io/jenkins/agent:bookworm
docker.io/jenkins/agent:bookworm-jdk17
docker.io/jenkins/agent:bookworm-jdk21
docker.io/jenkins/agent:bookworm-jdk25-preview
docker.io/jenkins/agent:jdk17
docker.io/jenkins/agent:jdk21
docker.io/jenkins/agent:jdk25-preview
docker.io/jenkins/agent:latest
docker.io/jenkins/agent:latest-alpine
docker.io/jenkins/agent:latest-alpine-jdk17
docker.io/jenkins/agent:latest-alpine-jdk21
docker.io/jenkins/agent:latest-alpine-jdk25-preview
docker.io/jenkins/agent:latest-alpine3.21
docker.io/jenkins/agent:latest-alpine3.21-jdk17
docker.io/jenkins/agent:latest-alpine3.21-jdk21
docker.io/jenkins/agent:latest-alpine3.21-jdk25-preview
docker.io/jenkins/agent:latest-bookworm
docker.io/jenkins/agent:latest-bookworm-jdk17
docker.io/jenkins/agent:latest-bookworm-jdk21
docker.io/jenkins/agent:latest-bookworm-jdk25-preview
docker.io/jenkins/agent:latest-jdk17
docker.io/jenkins/agent:latest-jdk21
docker.io/jenkins/agent:latest-jdk25-preview
docker.io/jenkins/agent:latest-rhel-ubi9
docker.io/jenkins/agent:latest-rhel-ubi9-jdk17
docker.io/jenkins/agent:latest-rhel-ubi9-jdk21
docker.io/jenkins/agent:latest-rhel-ubi9-jdk25-preview
docker.io/jenkins/agent:rhel-ubi9
docker.io/jenkins/agent:rhel-ubi9-jdk17
docker.io/jenkins/agent:rhel-ubi9-jdk21
docker.io/jenkins/agent:rhel-ubi9-jdk25-preview
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-alpine
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-alpine-jdk17
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-alpine-jdk21
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-alpine-jdk25-preview
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-alpine3.21
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-alpine3.21-jdk17
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-alpine3.21-jdk21
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-alpine3.21-jdk25-preview
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk17
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk21
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk25-preview
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-rhel-ubi9
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-rhel-ubi9-jdk17
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-rhel-ubi9-jdk21
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-rhel-ubi9-jdk25-preview
docker.io/jenkins/inbound-agent:alpine
docker.io/jenkins/inbound-agent:alpine-jdk17
docker.io/jenkins/inbound-agent:alpine-jdk21
docker.io/jenkins/inbound-agent:alpine-jdk25-preview
docker.io/jenkins/inbound-agent:alpine3.21
docker.io/jenkins/inbound-agent:alpine3.21-jdk17
docker.io/jenkins/inbound-agent:alpine3.21-jdk21
docker.io/jenkins/inbound-agent:alpine3.21-jdk25-preview
docker.io/jenkins/inbound-agent:bookworm
docker.io/jenkins/inbound-agent:bookworm-jdk17
docker.io/jenkins/inbound-agent:bookworm-jdk21
docker.io/jenkins/inbound-agent:bookworm-jdk25-preview
docker.io/jenkins/inbound-agent:jdk17
docker.io/jenkins/inbound-agent:jdk21
docker.io/jenkins/inbound-agent:jdk25-preview
docker.io/jenkins/inbound-agent:latest
docker.io/jenkins/inbound-agent:latest-alpine
docker.io/jenkins/inbound-agent:latest-alpine-jdk17
docker.io/jenkins/inbound-agent:latest-alpine-jdk21
docker.io/jenkins/inbound-agent:latest-alpine-jdk25-preview
docker.io/jenkins/inbound-agent:latest-alpine3.21
docker.io/jenkins/inbound-agent:latest-alpine3.21-jdk17
docker.io/jenkins/inbound-agent:latest-alpine3.21-jdk21
docker.io/jenkins/inbound-agent:latest-alpine3.21-jdk25-preview
docker.io/jenkins/inbound-agent:latest-bookworm
docker.io/jenkins/inbound-agent:latest-bookworm-jdk17
docker.io/jenkins/inbound-agent:latest-bookworm-jdk21
docker.io/jenkins/inbound-agent:latest-bookworm-jdk25-preview
docker.io/jenkins/inbound-agent:latest-jdk17
docker.io/jenkins/inbound-agent:latest-jdk21
docker.io/jenkins/inbound-agent:latest-jdk25-preview
docker.io/jenkins/inbound-agent:latest-rhel-ubi9
docker.io/jenkins/inbound-agent:latest-rhel-ubi9-jdk17
docker.io/jenkins/inbound-agent:latest-rhel-ubi9-jdk21
docker.io/jenkins/inbound-agent:latest-rhel-ubi9-jdk25-preview
docker.io/jenkins/inbound-agent:rhel-ubi9
docker.io/jenkins/inbound-agent:rhel-ubi9-jdk17
docker.io/jenkins/inbound-agent:rhel-ubi9-jdk21
docker.io/jenkins/inbound-agent:rhel-ubi9-jdk25-preview

Windows tags

docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk17-nanoserver-1809
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk17-nanoserver-ltsc2019
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk17-nanoserver-ltsc2022
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk17-windowsservercore-ltsc2019
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk17-windowsservercore-ltsc2022
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk21-nanoserver-1809
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk21-nanoserver-ltsc2019
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk21-nanoserver-ltsc2022
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk21-windowsservercore-ltsc2019
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk21-windowsservercore-ltsc2022
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk25-preview-nanoserver-1809
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk25-preview-nanoserver-ltsc2019
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk25-preview-nanoserver-ltsc2022
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk25-preview-windowsservercore-ltsc2019
docker.io/jenkins/agent:3283.v92c105e0f819-3-jdk25-preview-windowsservercore-ltsc2022
docker.io/jenkins/agent:3283.v92c105e0f819-3-nanoserver-1809
docker.io/jenkins/agent:3283.v92c105e0f819-3-nanoserver-ltsc2019
docker.io/jenkins/agent:3283.v92c105e0f819-3-nanoserver-ltsc2022
docker.io/jenkins/agent:3283.v92c105e0f819-3-windowsservercore-ltsc2019
docker.io/jenkins/agent:3283.v92c105e0f819-3-windowsservercore-ltsc2022
docker.io/jenkins/agent:jdk17-nanoserver-1809
docker.io/jenkins/agent:jdk17-nanoserver-ltsc2019
docker.io/jenkins/agent:jdk17-nanoserver-ltsc2022
docker.io/jenkins/agent:jdk17-windowsservercore-ltsc2019
docker.io/jenkins/agent:jdk17-windowsservercore-ltsc2022
docker.io/jenkins/agent:jdk21-nanoserver-1809
docker.io/jenkins/agent:jdk21-nanoserver-ltsc2019
docker.io/jenkins/agent:jdk21-nanoserver-ltsc2022
docker.io/jenkins/agent:jdk21-windowsservercore-ltsc2019
docker.io/jenkins/agent:jdk21-windowsservercore-ltsc2022
docker.io/jenkins/agent:jdk25-preview-nanoserver-1809
docker.io/jenkins/agent:jdk25-preview-nanoserver-ltsc2019
docker.io/jenkins/agent:jdk25-preview-nanoserver-ltsc2022
docker.io/jenkins/agent:jdk25-preview-windowsservercore-ltsc2019
docker.io/jenkins/agent:jdk25-preview-windowsservercore-ltsc2022
docker.io/jenkins/agent:nanoserver-1809
docker.io/jenkins/agent:nanoserver-ltsc2019
docker.io/jenkins/agent:nanoserver-ltsc2022
docker.io/jenkins/agent:windowsservercore-ltsc2019
docker.io/jenkins/agent:windowsservercore-ltsc2022
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk17-nanoserver-1809
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk17-nanoserver-ltsc2019
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk17-nanoserver-ltsc2022
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk17-windowsservercore-ltsc2019
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk17-windowsservercore-ltsc2022
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk21-nanoserver-1809
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk21-nanoserver-ltsc2019
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk21-nanoserver-ltsc2022
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk21-windowsservercore-ltsc2019
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk21-windowsservercore-ltsc2022
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk25-preview-nanoserver-1809
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk25-preview-nanoserver-ltsc2019
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk25-preview-nanoserver-ltsc2022
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk25-preview-windowsservercore-ltsc2019
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-jdk25-preview-windowsservercore-ltsc2022
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-nanoserver-1809
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-nanoserver-ltsc2019
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-nanoserver-ltsc2022
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-windowsservercore-ltsc2019
docker.io/jenkins/inbound-agent:3283.v92c105e0f819-3-windowsservercore-ltsc2022
docker.io/jenkins/inbound-agent:jdk17-nanoserver-1809
docker.io/jenkins/inbound-agent:jdk17-nanoserver-ltsc2019
docker.io/jenkins/inbound-agent:jdk17-nanoserver-ltsc2022
docker.io/jenkins/inbound-agent:jdk17-windowsservercore-ltsc2019
docker.io/jenkins/inbound-agent:jdk17-windowsservercore-ltsc2022
docker.io/jenkins/inbound-agent:jdk21-nanoserver-1809
docker.io/jenkins/inbound-agent:jdk21-nanoserver-ltsc2019
docker.io/jenkins/inbound-agent:jdk21-nanoserver-ltsc2022
docker.io/jenkins/inbound-agent:jdk21-windowsservercore-ltsc2019
docker.io/jenkins/inbound-agent:jdk21-windowsservercore-ltsc2022
docker.io/jenkins/inbound-agent:jdk25-preview-nanoserver-1809
docker.io/jenkins/inbound-agent:jdk25-preview-nanoserver-ltsc2019
docker.io/jenkins/inbound-agent:jdk25-preview-nanoserver-ltsc2022
docker.io/jenkins/inbound-agent:jdk25-preview-windowsservercore-ltsc2019
docker.io/jenkins/inbound-agent:jdk25-preview-windowsservercore-ltsc2022
docker.io/jenkins/inbound-agent:nanoserver-1809
docker.io/jenkins/inbound-agent:nanoserver-ltsc2019
docker.io/jenkins/inbound-agent:nanoserver-ltsc2022
docker.io/jenkins/inbound-agent:windowsservercore-ltsc2019
docker.io/jenkins/inbound-agent:windowsservercore-ltsc2022

Submitter checklist

Make sure you are opening from a topic/feature/bugfix branch (right side) and not your main branch!
Ensure that the pull request title represents the desired changelog entry
Please describe what you did
Link to relevant issues in GitHub or Jira
Link to relevant pull requests, esp. upstream and downstream changes
Ensure you have provided tests - that demonstrates feature works or fixes the issue

…K in preview

lemeurherveCB requested a review from a team as a code owner March 2, 2025 12:29

lemeurherveCB force-pushed the add-tags-function-to-docker-bake branch from 1b250ec to d821152 Compare March 2, 2025 12:34

lemeurherveCB changed the title ~~Add tags functions to docker bake~~ chore: add tags functions to docker bake Mar 2, 2025

This was referenced Mar 2, 2025

feat(jdk): Add Java 25 preview target for all images #939

Open

chore: add show-% Makefile target and use jdks_to_build in rhel_ubi9 bake target #945

Open

lemeurherveCB force-pushed the add-tags-function-to-docker-bake branch from 6b5f1b6 to 4a4afec Compare March 2, 2025 13:20

chore: add tags functions for Linux and Windows, taking in account JD…

d2681bc

…K in preview

lemeurherveCB force-pushed the add-tags-function-to-docker-bake branch from 4a4afec to d2681bc Compare March 2, 2025 15:03

better comments

a2cbfa0

timja approved these changes Mar 2, 2025

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

chore: add tags functions to docker bake #944

chore: add tags functions to docker bake #944

lemeurherveCB commented Mar 2, 2025 •

edited

Loading

chore: add tags functions to docker bake #944

Are you sure you want to change the base?

chore: add tags functions to docker bake #944

Conversation

lemeurherveCB commented Mar 2, 2025 • edited Loading

Testing done

Submitter checklist

lemeurherveCB commented Mar 2, 2025 •

edited

Loading