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 @@ -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.567
ARG JENKINS_VERSION=2.569
# 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 Expand Up @@ -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.567
ARG JENKINS_VERSION=2.569
ENV JENKINS_VERSION=${JENKINS_VERSION}

ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/jenkins.sh"]
Expand Down
4 changes: 2 additions & 2 deletions debian/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.567
ARG JENKINS_VERSION=2.569
# 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 Expand Up @@ -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.567
ARG JENKINS_VERSION=2.569
ENV JENKINS_VERSION=${JENKINS_VERSION}

ENTRYPOINT ["/usr/bin/tini", "--", "/usr/local/bin/jenkins.sh"]
Expand Down
2 changes: 1 addition & 1 deletion docker-bake.hcl
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ variable "default_jdk" {
}

variable "JENKINS_VERSION" {
default = "2.567"
default = "2.569"
}

variable "WAR_URL" {
Expand Down
2 changes: 1 addition & 1 deletion make.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ Param(
# Default script target
[String] $Target = 'build',
# Jenkins version to include
[String] $JenkinsVersion = '2.567',
[String] $JenkinsVersion = '2.569',
# Windows flavor and windows version to build
[String] $ImageType = 'windowsservercore-ltsc2022',
# Generate a docker compose file even if it already exists
Expand Down
4 changes: 2 additions & 2 deletions rhel/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.567
ARG JENKINS_VERSION=2.569
# 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 Expand Up @@ -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.567
ARG JENKINS_VERSION=2.569
ENV JENKINS_VERSION=${JENKINS_VERSION}

ENTRYPOINT ["/sbin/tini", "--", "/usr/local/bin/jenkins.sh"]
Expand Down
2 changes: 1 addition & 1 deletion tests/golden/expected_env_vars_except_hostname.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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.567
JENKINS_VERSION=2.569
LANG=C.UTF-8
PATH=/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
PWD=/
Expand Down
34 changes: 17 additions & 17 deletions tests/golden/expected_tags.txt
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
docker.io/jenkins/jenkins:2.567 (debian_jdk21)
docker.io/jenkins/jenkins:2.567-alpine (alpine_jdk21)
docker.io/jenkins/jenkins:2.567-alpine-jdk21 (alpine_jdk21)
docker.io/jenkins/jenkins:2.567-alpine-jdk25 (alpine_jdk25)
docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.567-jdk21 (debian_jdk21)
docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.567-jdk25 (debian_jdk25)
docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25)
docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25)
docker.io/jenkins/jenkins:2.567-rhel-ubi9-jdk21 (rhel_jdk21)
docker.io/jenkins/jenkins:2.567-rhel-ubi9-jdk25 (rhel_jdk25)
docker.io/jenkins/jenkins:2.567-slim (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.567-slim-jdk21 (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.567-slim-jdk25 (debian-slim_jdk25)
docker.io/jenkins/jenkins:2.569 (debian_jdk21)
docker.io/jenkins/jenkins:2.569-alpine (alpine_jdk21)
docker.io/jenkins/jenkins:2.569-alpine-jdk21 (alpine_jdk21)
docker.io/jenkins/jenkins:2.569-alpine-jdk25 (alpine_jdk25)
docker.io/jenkins/jenkins:2.569-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.569-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.569-jdk21 (debian_jdk21)
docker.io/jenkins/jenkins:2.569-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.569-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.569-jdk25 (debian_jdk25)
docker.io/jenkins/jenkins:2.569-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25)
docker.io/jenkins/jenkins:2.569-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25)
docker.io/jenkins/jenkins:2.569-rhel-ubi9-jdk21 (rhel_jdk21)
docker.io/jenkins/jenkins:2.569-rhel-ubi9-jdk25 (rhel_jdk25)
docker.io/jenkins/jenkins:2.569-slim (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.569-slim-jdk21 (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.569-slim-jdk25 (debian-slim_jdk25)
38 changes: 19 additions & 19 deletions tests/golden/expected_tags_latest_weekly.txt
Original file line number Diff line number Diff line change
@@ -1,22 +1,22 @@
docker.io/jenkins/jenkins:2.567 (debian_jdk21)
docker.io/jenkins/jenkins:2.567-alpine (alpine_jdk21)
docker.io/jenkins/jenkins:2.567-alpine-jdk21 (alpine_jdk21)
docker.io/jenkins/jenkins:2.567-alpine-jdk25 (alpine_jdk25)
docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.567-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.567-jdk21 (debian_jdk21)
docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.567-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.567-jdk25 (debian_jdk25)
docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25)
docker.io/jenkins/jenkins:2.567-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25)
docker.io/jenkins/jenkins:2.567-rhel-ubi9-jdk21 (rhel_jdk21)
docker.io/jenkins/jenkins:2.567-rhel-ubi9-jdk25 (rhel_jdk25)
docker.io/jenkins/jenkins:2.567-slim (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.567-slim-jdk21 (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.567-slim-jdk25 (debian-slim_jdk25)
docker.io/jenkins/jenkins:2.567-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.567-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.569 (debian_jdk21)
docker.io/jenkins/jenkins:2.569-alpine (alpine_jdk21)
docker.io/jenkins/jenkins:2.569-alpine-jdk21 (alpine_jdk21)
docker.io/jenkins/jenkins:2.569-alpine-jdk25 (alpine_jdk25)
docker.io/jenkins/jenkins:2.569-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.569-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.569-jdk21 (debian_jdk21)
docker.io/jenkins/jenkins:2.569-jdk21-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.569-jdk21-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk21)
docker.io/jenkins/jenkins:2.569-jdk25 (debian_jdk25)
docker.io/jenkins/jenkins:2.569-jdk25-hotspot-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk25)
docker.io/jenkins/jenkins:2.569-jdk25-hotspot-windowsservercore-ltsc2025 (windowsservercore-ltsc2025_jdk25)
docker.io/jenkins/jenkins:2.569-rhel-ubi9-jdk21 (rhel_jdk21)
docker.io/jenkins/jenkins:2.569-rhel-ubi9-jdk25 (rhel_jdk25)
docker.io/jenkins/jenkins:2.569-slim (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.569-slim-jdk21 (debian-slim_jdk21)
docker.io/jenkins/jenkins:2.569-slim-jdk25 (debian-slim_jdk25)
docker.io/jenkins/jenkins:2.569-windowsservercore-ltsc2022 (windowsservercore-ltsc2022_jdk21)
docker.io/jenkins/jenkins:2.569-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)
Expand Down
4 changes: 2 additions & 2 deletions windows/windowsservercore/hotspot/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.567
ARG JENKINS_VERSION=2.569
# 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}
Expand Down Expand Up @@ -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.567
ARG JENKINS_VERSION=2.569
ENV JENKINS_VERSION=${JENKINS_VERSION}

ENTRYPOINT ["powershell.exe", "-f", "C:/ProgramData/Jenkins/jenkins.ps1"]
Expand Down