Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions alpine/hotspot/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -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" {
Expand Down
4 changes: 2 additions & 2 deletions rhel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
22 changes: 11 additions & 11 deletions tests/golden/expected_tags.txt
Original file line number Diff line number Diff line change
@@ -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)
22 changes: 11 additions & 11 deletions tests/golden/expected_tags_latest_weekly.txt
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions windows/windowsservercore/hotspot/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down