From 763bf52564fbb63e8c6ba464e8c8b3049d128b50 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 17:42:12 +0200 Subject: [PATCH 1/5] Bump RHEL version to 9.8-1784004572 (#2408) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update value of base image (ARG RHEL_TAG) in Dockerfile Made with ❤️️ by updatecli * chore: Update default value of variable RHEL_TAG in docker-bake.hcl Made with ❤️️ by updatecli --------- Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> --- docker-bake.hcl | 2 +- rhel/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index bbc4b9422a..e360626e66 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -68,7 +68,7 @@ variable "DEBIAN_VERSION" { } variable "RHEL_TAG" { - default = "9.8-1782841664" + default = "9.8-1784004572" } variable "RHEL_RELEASE_LINE" { diff --git a/rhel/Dockerfile b/rhel/Dockerfile index c2e07daef1..5640e63f29 100644 --- a/rhel/Dockerfile +++ b/rhel/Dockerfile @@ -1,4 +1,4 @@ -ARG RHEL_TAG=9.8-1782841664 +ARG RHEL_TAG=9.8-1784004572 ARG RHEL_RELEASE_LINE=ubi9 FROM registry.access.redhat.com/${RHEL_RELEASE_LINE}/ubi:${RHEL_TAG} AS jre-and-war From 17c9be68a41686dfb107510e7886f193c03bb9c0 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 17:43:02 +0200 Subject: [PATCH 2/5] Bump Debian version to 20260713 (#2406) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update the value of the base image (ARG DEBIAN_VERSION) in the... ... Dockerfile Made with ❤️️ by updatecli * chore: Update the value of the base image DEBIAN_VERSION in the docke... ... r-bake.hcl Made with ❤️️ by updatecli --------- Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> --- debian/Dockerfile | 2 +- docker-bake.hcl | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/debian/Dockerfile b/debian/Dockerfile index d74eb9285b..9aed21bbe7 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -1,7 +1,7 @@ ARG TRIXIE_TAG=20251103 ARG DEBIAN_RELEASE_LINE=trixie -ARG DEBIAN_VERSION=20260623 +ARG DEBIAN_VERSION=20260713 ARG DEBIAN_VARIANT="-slim" FROM debian:"${DEBIAN_RELEASE_LINE}-${DEBIAN_VERSION}${DEBIAN_VARIANT}" AS jre-and-war diff --git a/docker-bake.hcl b/docker-bake.hcl index e360626e66..9fd661c6bf 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -64,7 +64,7 @@ variable "DEBIAN_RELEASE_LINE" { } variable "DEBIAN_VERSION" { - default = 20260623 + default = 20260713 } variable "RHEL_TAG" { From a205617e1061b4266a5675f46f097a392d9a04c4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <91831478+lemeurherve@users.noreply.github.com> Date: Tue, 14 Jul 2026 18:27:15 +0200 Subject: [PATCH 3/5] fix(windows): use `gpgv` instead of `gpg` for signature verification (#2399) --- windows/windowsservercore/hotspot/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/windows/windowsservercore/hotspot/Dockerfile b/windows/windowsservercore/hotspot/Dockerfile index 578c43d4bf..f37ccb256b 100644 --- a/windows/windowsservercore/hotspot/Dockerfile +++ b/windows/windowsservercore/hotspot/Dockerfile @@ -68,8 +68,8 @@ RUN New-Item -ItemType Directory -Path C:/war | Out-Null ; ` COPY jenkins.io-2026.key /war/jenkins-key.pub RUN & 'C:/Program Files/GnuPG/bin/gpg.exe' --version ; ` - & 'C:/Program Files/GnuPG/bin/gpg.exe' --import C:/war/jenkins-key.pub ; ` - & 'C:/Program Files/GnuPG/bin/gpg.exe' --verify --trust-model direct C:/war/jenkins.war.asc C:/war/jenkins.war + & 'C:/Program Files/GnuPG/bin/gpg.exe' --dearmor --output C:/war/jenkins-key.pgp C:/war/jenkins-key.pub ; ` + & 'C:/Program Files/GnuPG/bin/gpgv.exe' --keyring C:/war/jenkins-key.pgp C:/war/jenkins.war.asc C:/war/jenkins.war FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION}" AS controller From 883103e39a1bec5f11bfe9a419f4c68dd1b4ad40 Mon Sep 17 00:00:00 2001 From: "github-actions[bot]" <41898282+github-actions[bot]@users.noreply.github.com> Date: Tue, 14 Jul 2026 16:29:00 +0000 Subject: [PATCH 4/5] Bump default `JENKINS_VERSION` to Weekly 2.573 (#2407) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * chore: Update value of JENKINS_VERSION in (weekly) golden files for tags Made with ❤️️ by updatecli * chore: Update value of $JenkinsVersion in make.ps1 Made with ❤️️ by updatecli * chore: Update value of JENKINS_VERSION in golden file for env vars Made with ❤️️ by updatecli * chore: Update default value of JENKINS_VERSION in docker-bake.hcl Made with ❤️️ by updatecli * chore: Update value of JENKINS_VERSION in Dockerfile Made with ❤️️ by updatecli --------- Co-authored-by: GitHub Actions <41898282+github-actions[bot]@users.noreply.github.com> --- alpine/hotspot/Dockerfile | 4 +- debian/Dockerfile | 4 +- docker-bake.hcl | 2 +- make.ps1 | 2 +- rhel/Dockerfile | 4 +- .../expected_env_vars_except_hostname.txt | 2 +- tests/golden/expected_tags.txt | 34 ++++++++--------- tests/golden/expected_tags_latest_weekly.txt | 38 +++++++++---------- windows/windowsservercore/hotspot/Dockerfile | 4 +- 9 files changed, 47 insertions(+), 47 deletions(-) diff --git a/alpine/hotspot/Dockerfile b/alpine/hotspot/Dockerfile index 9f35ce57c2..a5a62acb19 100644 --- a/alpine/hotspot/Dockerfile +++ b/alpine/hotspot/Dockerfile @@ -41,7 +41,7 @@ RUN java_major_version="$(jlink --version 2>&1 | cut -c1-2)"; \ fi # Jenkins version being bundled in this docker image -ARG JENKINS_VERSION=2.572 +ARG JENKINS_VERSION=2.573 # Can be used to customize where jenkins.war get downloaded from ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war @@ -137,7 +137,7 @@ COPY jenkins-support /usr/local/bin/jenkins-support COPY jenkins.sh /usr/local/bin/jenkins.sh COPY jenkins-plugin-cli.sh /bin/jenkins-plugin-cli -ARG JENKINS_VERSION=2.572 +ARG JENKINS_VERSION=2.573 ENV JENKINS_VERSION=${JENKINS_VERSION} ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/jenkins.sh"] diff --git a/debian/Dockerfile b/debian/Dockerfile index 9aed21bbe7..29fbec5e5c 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -45,7 +45,7 @@ RUN java_major_version="$(jlink --version 2>&1 | cut -c1-2)"; \ fi # Jenkins version being bundled in this docker image -ARG JENKINS_VERSION=2.572 +ARG JENKINS_VERSION=2.573 # Can be used to customize where jenkins.war get downloaded from ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war @@ -151,7 +151,7 @@ COPY jenkins-support /usr/local/bin/jenkins-support COPY jenkins.sh /usr/local/bin/jenkins.sh COPY jenkins-plugin-cli.sh /bin/jenkins-plugin-cli -ARG JENKINS_VERSION=2.572 +ARG JENKINS_VERSION=2.573 ENV JENKINS_VERSION=${JENKINS_VERSION} ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/jenkins.sh"] diff --git a/docker-bake.hcl b/docker-bake.hcl index 9fd661c6bf..88badf6351 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -12,7 +12,7 @@ variable "default_jdk" { } variable "JENKINS_VERSION" { - default = "2.572" + default = "2.573" } variable "WAR_URL" { diff --git a/make.ps1 b/make.ps1 index 855303f0a0..935d628618 100644 --- a/make.ps1 +++ b/make.ps1 @@ -4,7 +4,7 @@ Param( # Default script target [String] $Target = 'build', # Jenkins version to include - [String] $JenkinsVersion = '2.572', + [String] $JenkinsVersion = '2.573', # Windows flavor and windows version to build [String] $ImageType = 'windowsservercore-ltsc2022', # Generate a docker compose file even if it already exists diff --git a/rhel/Dockerfile b/rhel/Dockerfile index 5640e63f29..f534071add 100644 --- a/rhel/Dockerfile +++ b/rhel/Dockerfile @@ -40,7 +40,7 @@ RUN java_major_version="$(jlink --version 2>&1 | cut -c1-2)"; \ fi # Jenkins version being bundled in this docker image -ARG JENKINS_VERSION=2.572 +ARG JENKINS_VERSION=2.573 # Can be used to customize where jenkins.war get downloaded from ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war @@ -141,7 +141,7 @@ COPY jenkins-support /usr/local/bin/jenkins-support COPY jenkins.sh /usr/local/bin/jenkins.sh COPY jenkins-plugin-cli.sh /bin/jenkins-plugin-cli -ARG JENKINS_VERSION=2.572 +ARG JENKINS_VERSION=2.573 ENV JENKINS_VERSION=${JENKINS_VERSION} ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/jenkins.sh"] diff --git a/tests/golden/expected_env_vars_except_hostname.txt b/tests/golden/expected_env_vars_except_hostname.txt index 4403c8310c..f64f9caa03 100644 --- a/tests/golden/expected_env_vars_except_hostname.txt +++ b/tests/golden/expected_env_vars_except_hostname.txt @@ -6,7 +6,7 @@ JENKINS_INCREMENTALS_REPO_MIRROR=https://repo.jenkins-ci.org/incrementals JENKINS_SLAVE_AGENT_PORT=50000 JENKINS_UC=https://updates.jenkins.io JENKINS_UC_EXPERIMENTAL=https://updates.jenkins.io/experimental -JENKINS_VERSION=2.572 +JENKINS_VERSION=2.573 LANG=C.UTF-8 PATH=/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin PWD=/ diff --git a/tests/golden/expected_tags.txt b/tests/golden/expected_tags.txt index 64e1a6d8b2..4ad83b0fce 100644 --- a/tests/golden/expected_tags.txt +++ b/tests/golden/expected_tags.txt @@ -1,17 +1,17 @@ -docker.io/jenkins/jenkins:2.572 (debian_jdk21) -docker.io/jenkins/jenkins:2.572-alpine (alpine_jdk21) -docker.io/jenkins/jenkins:2.572-alpine-jdk21 (alpine_jdk21) -docker.io/jenkins/jenkins:2.572-alpine-jdk25 (alpine_jdk25) -docker.io/jenkins/jenkins:2.572-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) -docker.io/jenkins/jenkins:2.572-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) -docker.io/jenkins/jenkins:2.572-jdk21 (debian_jdk21) -docker.io/jenkins/jenkins:2.572-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) -docker.io/jenkins/jenkins:2.572-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) -docker.io/jenkins/jenkins:2.572-jdk25 (debian_jdk25) -docker.io/jenkins/jenkins:2.572-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) -docker.io/jenkins/jenkins:2.572-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) -docker.io/jenkins/jenkins:2.572-rhel-ubi9-jdk21 (rhel_jdk21) -docker.io/jenkins/jenkins:2.572-rhel-ubi9-jdk25 (rhel_jdk25) -docker.io/jenkins/jenkins:2.572-slim (debian-slim_jdk21) -docker.io/jenkins/jenkins:2.572-slim-jdk21 (debian-slim_jdk21) -docker.io/jenkins/jenkins:2.572-slim-jdk25 (debian-slim_jdk25) +docker.io/jenkins/jenkins:2.573 (debian_jdk21) +docker.io/jenkins/jenkins:2.573-alpine (alpine_jdk21) +docker.io/jenkins/jenkins:2.573-alpine-jdk21 (alpine_jdk21) +docker.io/jenkins/jenkins:2.573-alpine-jdk25 (alpine_jdk25) +docker.io/jenkins/jenkins:2.573-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:2.573-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) +docker.io/jenkins/jenkins:2.573-jdk21 (debian_jdk21) +docker.io/jenkins/jenkins:2.573-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:2.573-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) +docker.io/jenkins/jenkins:2.573-jdk25 (debian_jdk25) +docker.io/jenkins/jenkins:2.573-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) +docker.io/jenkins/jenkins:2.573-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) +docker.io/jenkins/jenkins:2.573-rhel-ubi9-jdk21 (rhel_jdk21) +docker.io/jenkins/jenkins:2.573-rhel-ubi9-jdk25 (rhel_jdk25) +docker.io/jenkins/jenkins:2.573-slim (debian-slim_jdk21) +docker.io/jenkins/jenkins:2.573-slim-jdk21 (debian-slim_jdk21) +docker.io/jenkins/jenkins:2.573-slim-jdk25 (debian-slim_jdk25) diff --git a/tests/golden/expected_tags_latest_weekly.txt b/tests/golden/expected_tags_latest_weekly.txt index 508b705783..70c21d4a20 100644 --- a/tests/golden/expected_tags_latest_weekly.txt +++ b/tests/golden/expected_tags_latest_weekly.txt @@ -1,22 +1,22 @@ -docker.io/jenkins/jenkins:2.572 (debian_jdk21) -docker.io/jenkins/jenkins:2.572-alpine (alpine_jdk21) -docker.io/jenkins/jenkins:2.572-alpine-jdk21 (alpine_jdk21) -docker.io/jenkins/jenkins:2.572-alpine-jdk25 (alpine_jdk25) -docker.io/jenkins/jenkins:2.572-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) -docker.io/jenkins/jenkins:2.572-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) -docker.io/jenkins/jenkins:2.572-jdk21 (debian_jdk21) -docker.io/jenkins/jenkins:2.572-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) -docker.io/jenkins/jenkins:2.572-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) -docker.io/jenkins/jenkins:2.572-jdk25 (debian_jdk25) -docker.io/jenkins/jenkins:2.572-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) -docker.io/jenkins/jenkins:2.572-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) -docker.io/jenkins/jenkins:2.572-rhel-ubi9-jdk21 (rhel_jdk21) -docker.io/jenkins/jenkins:2.572-rhel-ubi9-jdk25 (rhel_jdk25) -docker.io/jenkins/jenkins:2.572-slim (debian-slim_jdk21) -docker.io/jenkins/jenkins:2.572-slim-jdk21 (debian-slim_jdk21) -docker.io/jenkins/jenkins:2.572-slim-jdk25 (debian-slim_jdk25) -docker.io/jenkins/jenkins:2.572-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) -docker.io/jenkins/jenkins:2.572-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) +docker.io/jenkins/jenkins:2.573 (debian_jdk21) +docker.io/jenkins/jenkins:2.573-alpine (alpine_jdk21) +docker.io/jenkins/jenkins:2.573-alpine-jdk21 (alpine_jdk21) +docker.io/jenkins/jenkins:2.573-alpine-jdk25 (alpine_jdk25) +docker.io/jenkins/jenkins:2.573-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:2.573-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) +docker.io/jenkins/jenkins:2.573-jdk21 (debian_jdk21) +docker.io/jenkins/jenkins:2.573-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:2.573-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) +docker.io/jenkins/jenkins:2.573-jdk25 (debian_jdk25) +docker.io/jenkins/jenkins:2.573-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25) +docker.io/jenkins/jenkins:2.573-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25) +docker.io/jenkins/jenkins:2.573-rhel-ubi9-jdk21 (rhel_jdk21) +docker.io/jenkins/jenkins:2.573-rhel-ubi9-jdk25 (rhel_jdk25) +docker.io/jenkins/jenkins:2.573-slim (debian-slim_jdk21) +docker.io/jenkins/jenkins:2.573-slim-jdk21 (debian-slim_jdk21) +docker.io/jenkins/jenkins:2.573-slim-jdk25 (debian-slim_jdk25) +docker.io/jenkins/jenkins:2.573-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21) +docker.io/jenkins/jenkins:2.573-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21) docker.io/jenkins/jenkins:alpine (alpine_jdk21) docker.io/jenkins/jenkins:alpine-jdk21 (alpine_jdk21) docker.io/jenkins/jenkins:alpine-jdk25 (alpine_jdk25) diff --git a/windows/windowsservercore/hotspot/Dockerfile b/windows/windowsservercore/hotspot/Dockerfile index f37ccb256b..fc1782fd1b 100644 --- a/windows/windowsservercore/hotspot/Dockerfile +++ b/windows/windowsservercore/hotspot/Dockerfile @@ -53,7 +53,7 @@ RUN New-Item -ItemType Directory -Path C:/temp | Out-Null ; ` Remove-Item -Path C:\temp -Recurse | Out-Null # Jenkins version being bundled in this docker image -ARG JENKINS_VERSION=2.572 +ARG JENKINS_VERSION=2.573 # Can be used to customize where jenkins.war get downloaded from ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war ENV WAR_URL=${WAR_URL} @@ -145,7 +145,7 @@ COPY jenkins.ps1 C:/ProgramData/Jenkins # See https://github.com/jenkinsci/plugin-installation-manager-tool#cli-options for information on parameters for jenkins-plugin-cli.ps1 for installing plugins into the docker image COPY jenkins-plugin-cli.ps1 C:/ProgramData/Jenkins -ARG JENKINS_VERSION=2.572 +ARG JENKINS_VERSION=2.573 ENV JENKINS_VERSION=${JENKINS_VERSION} ENTRYPOINT ["powershell.exe", "-f", "C:/ProgramData/Jenkins/jenkins.ps1"] From be78bf937b4d88643f73bb2d7f89b6c14ef0bdc0 Mon Sep 17 00:00:00 2001 From: Piyush Joshi <157375019+Piyush0049@users.noreply.github.com> Date: Wed, 15 Jul 2026 00:47:05 +0530 Subject: [PATCH 5/5] chore: remove obsolete Windows flavor TODO comment (#2410) --- tests/test_helpers.psm1 | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/test_helpers.psm1 b/tests/test_helpers.psm1 index f025b4eb55..6d0546139f 100644 --- a/tests/test_helpers.psm1 +++ b/tests/test_helpers.psm1 @@ -66,7 +66,6 @@ function Retry-Command { } function Get-SutImage { - # TODO: don't hardcode Windows flavor $DOCKERFILE = 'windows/windowsservercore/hotspot/Dockerfile' $IMAGETAG = Get-EnvOrDefault 'CONTROLLER_TAG' ''