Skip to content

chore: download war from mirrors unless we are publishing a release #2074

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 19 commits into from
Sep 22, 2025
Merged

chore: download war from mirrors unless we are publishing a release #2074

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
06078fb
chore: download war from mirrors unless we are publishing a release
lemeurherve Sep 19, 2025
aa634ff
rename `JENKINS_URL` to `WAR_URL` to avoid conflict with Jenkins's ow…
lemeurherve Sep 19, 2025
8d22dd1
fix condition in make.ps1
lemeurherve Sep 19, 2025
d9f7143
remove double quotes around `WAR_URL` ARG value
lemeurherve Sep 19, 2025
4b21ffc
set ENV `WAR_URL` in Windows Dockerfile
lemeurherve Sep 19, 2025
1d5b0e9
try out WAR_URL without any variable interpolation (was working origi…
lemeurherve Sep 20, 2025
6a4a3f5
Pass WAR_URL in build-windows.yaml
lemeurherve Sep 20, 2025
fd32886
debug: show WAR_URL, releaseLine, JENKINS_SHA & jenkinsShaURL in make…
lemeurherve Sep 20, 2025
dbbfaef
debug: distinct RUN commands in Windows Dockerfile to check what's fa…
lemeurherve Sep 20, 2025
919cdd2
keep only the sha256 part in JENKINS_SHA value in make.ps1
lemeurherve Sep 20, 2025
c9f1876
test: simulate LTS (to be reverted)
lemeurherve Sep 21, 2025
a120baf
cleanup
lemeurherve Sep 21, 2025
2dc353c
rename `JENKINS_SHA` to `WAR_SHA` to align with `WAR_URL` renaming
lemeurherve Sep 21, 2025
b735c05
Revert "rename `JENKINS_SHA` to `WAR_SHA` to align with `WAR_URL` ren…
lemeurherve Sep 21, 2025
2be154f
Revert "test: simulate LTS (to be reverted)"
lemeurherve Sep 21, 2025
c57b7a1
merge upstream/master
lemeurherve Sep 21, 2025
f4ea4c7
regroup \WAR_SHA\ and \WAR_URL\ in docker-bake.hcl
lemeurherve Sep 21, 2025
ec1c1e6
restore WAR_SHA fix in make.ps1
lemeurherve Sep 21, 2025
2402170
empty commit to trigger a build
lemeurherve Sep 21, 2025
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
12 changes: 10 additions & 2 deletions Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,11 @@ stage('Build') {
if (env.TAG_NAME && (env.PUBLISH == 'true')) {
// Split to ensure any suffix is not taken in account (but allow suffix tags to trigger rebuilds)
jenkins_version = env.TAG_NAME.split('-')[0]
withEnv(["JENKINS_VERSION=${jenkins_version}"]) {
// Setting WAR_URL to download war from Artifactory instead of mirrors on publication from trusted.ci.jenkins.io
withEnv([
"JENKINS_VERSION=${jenkins_version}",
"WAR_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${jenkins_version}/jenkins-war-${jenkins_version}.war"
]) {
stage('Publish') {
infra.withDockerCredentials {
withEnv(['DOCKERHUB_ORGANISATION=jenkins', 'DOCKERHUB_REPO=jenkins']) {
Expand Down Expand Up @@ -171,7 +175,11 @@ stage('Build') {
// Split to ensure any suffix is not taken in account (but allow suffix tags to trigger rebuilds)
jenkins_version = env.TAG_NAME.split('-')[0]
builds['linux'] = {
withEnv(["JENKINS_VERSION=${jenkins_version}"]) {
// Setting WAR_URL to download war from Artifactory instead of mirrors on publication from trusted.ci.jenkins.io
withEnv([
"JENKINS_VERSION=${jenkins_version}",
"WAR_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${jenkins_version}/jenkins-war-${jenkins_version}.war"
]) {
nodeWithTimeout('docker') {
stage('Checkout') {
checkout scm
Expand Down
2 changes: 1 addition & 1 deletion alpine/hotspot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ ENV JENKINS_VERSION=${JENKINS_VERSION:-2.504}
ARG WAR_SHA=efc91d6be8d79dd078e7f930fc4a5f135602d0822a5efe9091808fdd74607d32

# Can be used to customize where jenkins.war get downloaded from
ARG WAR_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war

# could use ADD but this one does not check Last-Modified header neither does it allow to control checksum
# see https://github.com/docker/docker/issues/8331
Expand Down
2 changes: 2 additions & 0 deletions build-windows.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ services:
JAVA_VERSION: 17.0.16_8
WAR_SHA: ${WAR_SHA}
JENKINS_VERSION: ${JENKINS_VERSION}
WAR_URL: ${WAR_URL}
TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}
WINDOWS_VERSION: ${WINDOWS_VERSION}
tags:
Expand All @@ -25,6 +26,7 @@ services:
JAVA_VERSION: 21.0.8_9
WAR_SHA: ${WAR_SHA}
JENKINS_VERSION: ${JENKINS_VERSION}
WAR_URL: ${WAR_URL}
TOOLS_WINDOWS_VERSION: ${TOOLS_WINDOWS_VERSION}
WINDOWS_VERSION: ${WINDOWS_VERSION}
tags:
Expand Down
2 changes: 1 addition & 1 deletion debian/bookworm-slim/hotspot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ ENV JENKINS_VERSION=${JENKINS_VERSION:-2.504}
ARG WAR_SHA=efc91d6be8d79dd078e7f930fc4a5f135602d0822a5efe9091808fdd74607d32

# Can be used to customize where jenkins.war get downloaded from
ARG WAR_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war

# could use ADD but this one does not check Last-Modified header neither does it allow to control checksum
# see https://github.com/docker/docker/issues/8331
Expand Down
2 changes: 1 addition & 1 deletion debian/bookworm/hotspot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ ENV JENKINS_VERSION=${JENKINS_VERSION:-2.504}
ARG WAR_SHA=efc91d6be8d79dd078e7f930fc4a5f135602d0822a5efe9091808fdd74607d32

# Can be used to customize where jenkins.war get downloaded from
ARG WAR_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war

# could use ADD but this one does not check Last-Modified header neither does it allow to control checksum
# see https://github.com/docker/docker/issues/8331
Expand Down
25 changes: 25 additions & 0 deletions docker-bake.hcl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,10 @@ variable "WAR_SHA" {
default = "efc91d6be8d79dd078e7f930fc4a5f135602d0822a5efe9091808fdd74607d32"
}

variable "WAR_URL" {
default = ""
}

variable "REGISTRY" {
default = "docker.io"
}
Expand Down Expand Up @@ -120,6 +124,19 @@ function "tag_lts" {
result = equal(LATEST_LTS, "true") ? tag(prepend_jenkins_version, tag) : ""
}

# return WAR_URL if not empty, get.jenkins.io URL depending on JENKINS_VERSION release line otherwise
function "war_url" {
# If JENKINS_VERSION has more than one sequence of digits with a trailing literal '.', this is LTS
# 2.523 has only one sequence of digits with a trailing literal '.'
# 2.516.1 has two sequences of digits with a trailing literal '.'
params = []
result = (notequal(WAR_URL, "")
? WAR_URL
: (length(regexall("[0-9]+[.]", JENKINS_VERSION)) < 2
? "https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war"
: "https://get.jenkins.io/war-stable/${JENKINS_VERSION}/jenkins.war"))
}

# ---- targets ----

target "alpine_jdk17" {
Expand All @@ -128,6 +145,7 @@ target "alpine_jdk17" {
args = {
JENKINS_VERSION = JENKINS_VERSION
WAR_SHA = WAR_SHA
WAR_URL = war_url()
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
ALPINE_TAG = ALPINE_FULL_TAG
Expand All @@ -148,6 +166,7 @@ target "alpine_jdk21" {
args = {
JENKINS_VERSION = JENKINS_VERSION
WAR_SHA = WAR_SHA
WAR_URL = war_url()
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
ALPINE_TAG = ALPINE_FULL_TAG
Expand All @@ -172,6 +191,7 @@ target "debian_jdk17" {
args = {
JENKINS_VERSION = JENKINS_VERSION
WAR_SHA = WAR_SHA
WAR_URL = war_url()
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
Expand All @@ -193,6 +213,7 @@ target "debian_jdk21" {
args = {
JENKINS_VERSION = JENKINS_VERSION
WAR_SHA = WAR_SHA
WAR_URL = war_url()
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
Expand All @@ -218,6 +239,7 @@ target "debian_slim_jdk17" {
args = {
JENKINS_VERSION = JENKINS_VERSION
WAR_SHA = WAR_SHA
WAR_URL = war_url()
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
Expand All @@ -237,6 +259,7 @@ target "debian_slim_jdk21" {
args = {
JENKINS_VERSION = JENKINS_VERSION
WAR_SHA = WAR_SHA
WAR_URL = war_url()
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
BOOKWORM_TAG = BOOKWORM_TAG
Expand All @@ -260,6 +283,7 @@ target "rhel_ubi9_jdk17" {
args = {
JENKINS_VERSION = JENKINS_VERSION
WAR_SHA = WAR_SHA
WAR_URL = war_url()
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
JAVA_VERSION = JAVA17_VERSION
Expand All @@ -279,6 +303,7 @@ target "rhel_ubi9_jdk21" {
args = {
JENKINS_VERSION = JENKINS_VERSION
WAR_SHA = WAR_SHA
WAR_URL = war_url()
COMMIT_SHA = COMMIT_SHA
PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
JAVA_VERSION = JAVA21_VERSION
Expand Down
13 changes: 10 additions & 3 deletions make.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,15 @@ $env:JENKINS_VERSION = "$JenkinsVersion"
# Compared to weekly releases, LTS releases include an additional build number in their version
# Note: the ':' separator is included as trying to set an environment variable to empty on Windows unset it.
$env:SEPARATOR_LTS_PREFIX = ':'
$releaseLine = 'war'
if ($JenkinsVersion.Split('.').Count -eq 3) {
$env:SEPARATOR_LTS_PREFIX = ':lts-'
$releaseLine = 'war-stable'
}

# If there is no WAR_URL set, using get.jenkins.io URL depending on the release line
if([String]::IsNullOrWhiteSpace($env:WAR_URL)) {
$env:WAR_URL = 'https://get.jenkins.io/{0}/{1}/jenkins.war' -f $releaseLine, $env:JENKINS_VERSION
}

$items = $ImageType.Split('-')
Expand All @@ -50,10 +57,10 @@ if ($items[1] -eq 'ltsc2019') {
$env:TOOLS_WINDOWS_VERSION = '1809'
}

# Retrieve the sha256 corresponding to the JENKINS_VERSION
$jenkinsShaURL = 'https://repo.jenkins-ci.org/releases/org/jenkins-ci/main/jenkins-war/{0}/jenkins-war-{0}.war.sha256' -f $env:JENKINS_VERSION
# Retrieve the sha256 corresponding to the war file
$warShaURL = '{0}.sha256' -f $env:WAR_URL
$webClient = New-Object System.Net.WebClient
$env:WAR_SHA = $webClient.DownloadString($jenkinsShaURL).ToUpper()
$env:WAR_SHA = $webClient.DownloadString($warShaURL).Split(' ')[0]
Copy link
Member Author

@lemeurherve lemeurherve Sep 21, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

With the help of temporary debug statements in fd32886, I found out why my builds were failing on Windows on the SHA256 checksum:


$env:COMMIT_SHA=$(git rev-parse HEAD)

Expand Down
2 changes: 1 addition & 1 deletion rhel/ubi9/hotspot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,7 @@ ENV JENKINS_VERSION=${JENKINS_VERSION:-2.504}
ARG WAR_SHA=efc91d6be8d79dd078e7f930fc4a5f135602d0822a5efe9091808fdd74607d32

# Can be used to customize where jenkins.war get downloaded from
ARG WAR_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war

# could use ADD but this one does not check Last-Modified header neither does it allow to control checksum
# see https://github.com/docker/docker/issues/8331
Expand Down
4 changes: 2 additions & 2 deletions windows/windowsservercore/hotspot/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,11 +100,11 @@ ENV JENKINS_VERSION=${JENKINS_VERSION:-2.504}
ARG WAR_SHA=efc91d6be8d79dd078e7f930fc4a5f135602d0822a5efe9091808fdd74607d32

# Can be used to customize where jenkins.war get downloaded from
ARG WAR_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/${JENKINS_VERSION}/jenkins-war-${JENKINS_VERSION}.war
ARG WAR_URL=https://get.jenkins.io/war/${JENKINS_VERSION}/jenkins.war

# could use ADD but this one does not check Last-Modified header neither does it allow to control checksum
# see https://github.com/docker/docker/issues/8331
RUN Invoke-WebRequest -Uri "$env:WAR_URL" -OutFile C:/ProgramData/Jenkins/jenkins.war ; `
RUN Invoke-WebRequest -Uri "$env:WAR_URL" -OutFile C:/ProgramData/Jenkins/jenkins.war; `
if ((Get-FileHash C:/ProgramData/Jenkins/jenkins.war -Algorithm SHA256).Hash -ne $env:WAR_SHA) {exit 1}

ENV JENKINS_UC=https://updates.jenkins.io
Expand Down