diff --git a/alpine/hotspot/Dockerfile b/alpine/hotspot/Dockerfile index b4542fab30..8908e847c2 100644 --- a/alpine/hotspot/Dockerfile +++ b/alpine/hotspot/Dockerfile @@ -95,10 +95,10 @@ RUN mkdir -p ${REF}/init.groovy.d # jenkins version being bundled in this docker image ARG JENKINS_VERSION -ENV JENKINS_VERSION=${JENKINS_VERSION:-2.534} +ENV JENKINS_VERSION=${JENKINS_VERSION:-2.546} # jenkins.war checksum, download will be validated using it -ARG WAR_SHA=fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228 +ARG WAR_SHA=f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983 # Can be used to customize where jenkins.war get downloaded from ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war diff --git a/debian/Dockerfile b/debian/Dockerfile index 4f89ca6022..c9681c6b24 100644 --- a/debian/Dockerfile +++ b/debian/Dockerfile @@ -109,10 +109,10 @@ RUN mkdir -p ${REF}/init.groovy.d # jenkins version being bundled in this docker image ARG JENKINS_VERSION -ENV JENKINS_VERSION=${JENKINS_VERSION:-2.534} +ENV JENKINS_VERSION=${JENKINS_VERSION:-2.546} # jenkins.war checksum, download will be validated using it -ARG WAR_SHA=fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228 +ARG WAR_SHA=f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983 # Can be used to customize where jenkins.war get downloaded from ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war diff --git a/docker-bake.hcl b/docker-bake.hcl index cc8a77faa3..dfd06e5df7 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -12,11 +12,11 @@ variable "default_jdk" { } variable "JENKINS_VERSION" { - default = "2.534" + default = "2.546" } variable "WAR_SHA" { - default = "fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228" + default = "f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983" } variable "WAR_URL" { diff --git a/rhel/Dockerfile b/rhel/Dockerfile index 51cd34a0c3..a1d4bdae9f 100644 --- a/rhel/Dockerfile +++ b/rhel/Dockerfile @@ -99,10 +99,10 @@ RUN curl -fsSL "https://github.com/krallin/tini/releases/download/${TINI_VERSION # jenkins version being bundled in this docker image ARG JENKINS_VERSION -ENV JENKINS_VERSION=${JENKINS_VERSION:-2.534} +ENV JENKINS_VERSION=${JENKINS_VERSION:-2.546} # jenkins.war checksum, download will be validated using it -ARG WAR_SHA=fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228 +ARG WAR_SHA=f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983 # Can be used to customize where jenkins.war get downloaded from ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war diff --git a/tests/golden/expected_tags.txt b/tests/golden/expected_tags.txt index 555e6bd1c7..18d0f18064 100644 --- a/tests/golden/expected_tags.txt +++ b/tests/golden/expected_tags.txt @@ -1,11 +1,11 @@ -docker.io/jenkins/jenkins:2.534 (debian_jdk21) -docker.io/jenkins/jenkins:2.534-alpine (alpine_jdk21) -docker.io/jenkins/jenkins:2.534-alpine-jdk21 (alpine_jdk21) -docker.io/jenkins/jenkins:2.534-alpine-jdk25 (alpine_jdk25) -docker.io/jenkins/jenkins:2.534-jdk21 (debian_jdk21) -docker.io/jenkins/jenkins:2.534-jdk25 (debian_jdk25) -docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk21 (rhel_jdk21) -docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk25 (rhel_jdk25) -docker.io/jenkins/jenkins:2.534-slim (debian-slim_jdk21) -docker.io/jenkins/jenkins:2.534-slim-jdk21 (debian-slim_jdk21) -docker.io/jenkins/jenkins:2.534-slim-jdk25 (debian-slim_jdk25) +docker.io/jenkins/jenkins:2.546 (debian_jdk21) +docker.io/jenkins/jenkins:2.546-alpine (alpine_jdk21) +docker.io/jenkins/jenkins:2.546-alpine-jdk21 (alpine_jdk21) +docker.io/jenkins/jenkins:2.546-alpine-jdk25 (alpine_jdk25) +docker.io/jenkins/jenkins:2.546-jdk21 (debian_jdk21) +docker.io/jenkins/jenkins:2.546-jdk25 (debian_jdk25) +docker.io/jenkins/jenkins:2.546-rhel-ubi9-jdk21 (rhel_jdk21) +docker.io/jenkins/jenkins:2.546-rhel-ubi9-jdk25 (rhel_jdk25) +docker.io/jenkins/jenkins:2.546-slim (debian-slim_jdk21) +docker.io/jenkins/jenkins:2.546-slim-jdk21 (debian-slim_jdk21) +docker.io/jenkins/jenkins:2.546-slim-jdk25 (debian-slim_jdk25) diff --git a/tests/golden/expected_tags_latest_weekly.txt b/tests/golden/expected_tags_latest_weekly.txt index 22538ab512..b17556fdc7 100644 --- a/tests/golden/expected_tags_latest_weekly.txt +++ b/tests/golden/expected_tags_latest_weekly.txt @@ -1,14 +1,14 @@ -docker.io/jenkins/jenkins:2.534 (debian_jdk21) -docker.io/jenkins/jenkins:2.534-alpine (alpine_jdk21) -docker.io/jenkins/jenkins:2.534-alpine-jdk21 (alpine_jdk21) -docker.io/jenkins/jenkins:2.534-alpine-jdk25 (alpine_jdk25) -docker.io/jenkins/jenkins:2.534-jdk21 (debian_jdk21) -docker.io/jenkins/jenkins:2.534-jdk25 (debian_jdk25) -docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk21 (rhel_jdk21) -docker.io/jenkins/jenkins:2.534-rhel-ubi9-jdk25 (rhel_jdk25) -docker.io/jenkins/jenkins:2.534-slim (debian-slim_jdk21) -docker.io/jenkins/jenkins:2.534-slim-jdk21 (debian-slim_jdk21) -docker.io/jenkins/jenkins:2.534-slim-jdk25 (debian-slim_jdk25) +docker.io/jenkins/jenkins:2.546 (debian_jdk21) +docker.io/jenkins/jenkins:2.546-alpine (alpine_jdk21) +docker.io/jenkins/jenkins:2.546-alpine-jdk21 (alpine_jdk21) +docker.io/jenkins/jenkins:2.546-alpine-jdk25 (alpine_jdk25) +docker.io/jenkins/jenkins:2.546-jdk21 (debian_jdk21) +docker.io/jenkins/jenkins:2.546-jdk25 (debian_jdk25) +docker.io/jenkins/jenkins:2.546-rhel-ubi9-jdk21 (rhel_jdk21) +docker.io/jenkins/jenkins:2.546-rhel-ubi9-jdk25 (rhel_jdk25) +docker.io/jenkins/jenkins:2.546-slim (debian-slim_jdk21) +docker.io/jenkins/jenkins:2.546-slim-jdk21 (debian-slim_jdk21) +docker.io/jenkins/jenkins:2.546-slim-jdk25 (debian-slim_jdk25) 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 539c715430..474d5dea6a 100644 --- a/windows/windowsservercore/hotspot/Dockerfile +++ b/windows/windowsservercore/hotspot/Dockerfile @@ -98,10 +98,10 @@ RUN New-Item -ItemType Directory -Force -Path C:/ProgramData/Jenkins/Reference/i # jenkins version being bundled in this docker image ARG JENKINS_VERSION -ENV JENKINS_VERSION=${JENKINS_VERSION:-2.534} +ENV JENKINS_VERSION=${JENKINS_VERSION:-2.546} # jenkins.war checksum, download will be validated using it -ARG WAR_SHA=fcf13a8ebbe69d678608cc4b3885ece7d7e697d6da4c3691025a06968ddef228 +ARG WAR_SHA=f1b03ebf8fdb0ac893fbac9df9835d736ab9825399dc43de8a00d3f3913d8983 # Can be used to customize where jenkins.war get downloaded from ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war