Skip to content

fix(windows): proper WAR_SHA #2226

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

Draft
lemeurherve wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

fix(windows): proper WAR_SHA #2226

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8080c8b
Show WAR_URL in windows logs
lemeurherve Jan 20, 2026
d014e14
make Initialize-DockerComposeFile compatible with PowerShell 7
lemeurherve Jan 20, 2026
8711e2a
try out setting JENKINS_VERSION to 2.547 only, in docker bake and win…
lemeurherve Jan 20, 2026
0408c99
Revert "try out setting JENKINS_VERSION to 2.547 only, in docker bake…
lemeurherve Jan 20, 2026
0287cb7
debug: set JENKINS_VERSION=2.547 and WAR_URL=repo.jenkins-ci.org/... …
lemeurherve Jan 20, 2026
f2aa96a
debug: show env
lemeurherve Jan 20, 2026
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
10 changes: 9 additions & 1 deletion Jenkinsfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,15 @@ stage('Build') {
checkout scm
}

withEnv(["IMAGE_TYPE=${imageType}"]) {
withEnv([
"IMAGE_TYPE=${imageType}",
// DEBUG
"JENKINS_VERSION=2.547",
"WAR_URL=https://repo.jenkins-ci.org/public/org/jenkins-ci/main/jenkins-war/2.547/jenkins-war-2.547.war"
]) {
stage('Show env') {
powershell 'env | Sort'
}
if (!infra.isTrusted()) {
/* Outside of the trusted.ci environment, we're building and testing
* the Dockerfile in this repository, but not publishing to docker hub
Expand Down
6 changes: 6 additions & 0 deletions make.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,7 @@ if ($JenkinsVersion.Split('.').Count -eq 3) {
# 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
Write-Host "Using env:WAR_URL: $env:WAR_URL"
}

# Retrieve the sha256 corresponding to the war file
Expand Down Expand Up @@ -150,6 +151,11 @@ function Initialize-DockerComposeFile {
$yqMainQuery = '.target[] | del(.output) | {(. | key): {\"image\": .tags[0], \"build\": .}}'
# Encapsulate under a top level 'services' map
$yqServicesQuery = '{\"services\": .}'
if ($PSVersionTable.PSVersion.Major -ge 7) {
Write-Host 'Using a query compatible with PowerShell 7'
$yqMainQuery = '.target[] | del(.output) | {(. | key): {"image": .tags[0], "build": .}}'
$yqServicesQuery = '{"services": .}'
}

# - Use docker buildx bake to output image definitions from the "<windowsFlavor>" bake target
# - Convert with yq to the format expected by docker compose
Expand Down