wip

Signed-off-by: Damien Duportal <damien.duportal@gmail.com>

Author: dduportal

.ci/publish.sh

@@ -107,7 +107,7 @@ $(printf '  %s\n' "${build_opts[@]}")
 EOF
 
 echo '* RESOLVED BAKE CONFIG:'
-docker buildx bake --file docker-bake.hcl --progress=quiet --print "${BAKE_TARGET}"
+docker buildx bake --file docker-bake.hcl --file docker-bake.override.json --file docker-bake.override.json --progress=quiet --print "${BAKE_TARGET}"
 
 if [[ "${CI:-false}" == "false" ]]; then
   read -rp "Confirm? [y/N] " answer

docker-bake.hcl

@@ -171,7 +171,7 @@ target "windowsservercore" {
     WAR_URL            = war_url()
     COMMIT_SHA         = COMMIT_SHA
     PLUGIN_CLI_VERSION = PLUGIN_CLI_VERSION
-    JAVA_VERSION       = javaversion(jdk)
+    JAVA_ZIP_URL       = lookup(jdk_installer_urls["windows"]["amd64"], jdk, "Installer URL not found")
     JAVA_HOME          = "C:/openjdk-${jdk}"
     WINDOWS_VERSION    = windows_version
   }

docker-bake.override.json

@@ -0,0 +1,15 @@
+{
+  "variable": {
+    "jdk_installer_urls": {
+      "default": {
+        "windows": {
+          "amd64": {
+            "17": "https://github.com/adoptium/temurin17-binaries/releases/download/jdk-17.0.19%2B10/OpenJDK17U-jdk_x64_windows_hotspot_17.0.19_10.zip",
+            "21": "https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.11%2B10/OpenJDK21U-jdk_x64_windows_hotspot_21.0.11_10.zip",
+            "25": "https://github.com/adoptium/temurin25-binaries/releases/download/jdk-25.0.3%2B9/OpenJDK25U-jdk_x64_windows_hotspot_25.0.3_9.zip"
+          }
+        }
+      }
+    }
+  }
+}

make.ps1

@@ -188,7 +188,7 @@ function Initialize-DockerComposeFile {
     # - Use docker buildx bake to output image definitions from the "<windowsFlavor>" bake target
     # - Convert with yq to the format expected by docker compose
     # - Store the result in the docker compose file
-    docker buildx bake --progress=quiet --file=docker-bake.hcl $windowsFlavor --print |
+    docker buildx bake --progress=quiet --file=docker-bake.hcl --file docker-bake.override.json $windowsFlavor --print |
         yq --prettyPrint $yqMainQuery |
         yq $yqServicesQuery |
         Out-File -FilePath $DockerComposeFile
@@ -208,7 +208,7 @@ yq --version
 # Add 'lts-' prefix to LTS tags not including Jenkins version
 # Compared to weekly releases, LTS releases include an additional build number in their version
 $releaseLine = 'war'
-# Determine if the current JENKINS_VERSION corresponds to the latest Weekly or LTS version from Artifactory 
+# Determine if the current JENKINS_VERSION corresponds to the latest Weekly or LTS version from Artifactory
 $isJenkinsVersionLatest = Test-IsLatestJenkinsRelease -Version $JenkinsVersion
 
 if ($JenkinsVersion.Split('.').Count -eq 3) {

updatecli/updatecli.d/jdk21.yaml

@@ -61,7 +61,6 @@ targets:
         - alpine/hotspot/Dockerfile
         - debian/Dockerfile
         - rhel/Dockerfile
-        - windows/windowsservercore/hotspot/Dockerfile
       instruction:
         keyword: ARG
         matcher: JAVA_VERSION

windows/windowsservercore/hotspot/Dockerfile

@@ -1,32 +1,31 @@
 # escape=`
 # hadolint shell=powershell
 
-ARG JAVA_VERSION=21.0.11_10
 ARG WINDOWS_VERSION=ltsc2022
 
 FROM mcr.microsoft.com/windows/servercore:"${WINDOWS_VERSION}" AS jre-and-war
 
 # $ProgressPreference: https://github.com/PowerShell/PowerShell/issues/2138#issuecomment-251261324
 SHELL ["powershell", "-Command", "$ErrorActionPreference = 'Stop'; $ProgressPreference = 'SilentlyContinue';"]
 
-ARG JAVA_VERSION=21.0.11_10
-
-RUN New-Item -ItemType Directory -Path C:\temp | Out-Null ; `
-    $javaMajorVersion = $env:JAVA_VERSION.substring(0,2) ; `
-    $msiUrl = 'https://api.adoptium.net/v3/installer/version/jdk-{0}/windows/x64/jdk/hotspot/normal/eclipse?project=jdk' -f $env:JAVA_VERSION.Replace('_', '%2B') ; `
-    Invoke-WebRequest $msiUrl -OutFile 'C:\temp\jdk.msi' ; `
-    $proc = Start-Process -FilePath 'msiexec.exe' -ArgumentList '/i', 'C:\temp\jdk.msi', '/L*V', 'C:\temp\OpenJDK.log', '/quiet', 'ADDLOCAL=FeatureEnvironment,FeatureJarFileRunWith,FeatureJavaHome',  "INSTALLDIR=C:\openjdk-${javaMajorVersion}" -Wait -Passthru ; `
-    $proc.WaitForExit() ; `
-    Remove-Item -Path C:\temp -Recurse | Out-Null
-
-RUN Write-Host 'javac --version' ; javac --version ; `
-    Write-Host 'java --version' ; java --version
-
-RUN $version = (jlink --version) ; `
+ARG JAVA_ZIP_URL="Provided by docker-bake.hcl"
+ARG jdkTempHome='C:\openjdk'
+ARG jdkTemp='C:\jdktemp'
+ARG localArchive="${jdkTemp}\jdk.zip"
+RUN New-Item -ItemType Directory -Path $env:jdkTemp | Out-Null ; `
+    Invoke-WebRequest $env:JAVA_ZIP_URL -OutFile $env:localArchive ; `
+    Expand-Archive -Path $env:localArchive -DestinationPath $env:jdkTemp ; `
+    $expandedDir = Get-ChildItem -Path $env:jdkTemp -Directory | Where-Object { $_.Name -like 'jdk*' } ; `
+    Move-Item -Path $expandedDir.FullName -Destination $env:jdkTempHome -Force ; `
+    Remove-Item -Path $env:jdkTemp -Recurse | Out-Null
+
+RUN Write-Host 'javac --version' ; $env:jdkTempHome/javac --version ; `
+    Write-Host 'java --version' ; $env:jdkTempHome/java --version
+
+RUN $version = ($env:jdkTempHome/jlink --version) ; `
     $javaMajorVersion = $version.Substring(0,2) ; `
     if ($javaMajorVersion -eq '25') { `
-        $openjdkFolder = 'openjdk-{0}' -f $javaMajorVersion ; `
-        Copy-Item -Path $openjdkFolder -Destination C:\javaruntime -Recurse ; `
+        Move-Item -Path $$env:jdkTempHome -Destination C:\javaruntime -Recurse ; `
     } else { `
         $options = '--compress=2' ; `
         switch ($version.Substring(0,3)) { `
@@ -36,7 +35,7 @@ RUN $version = (jlink --version) ; `
                 exit 1 ; `
             } `
         } `
-        & jlink `
+        & $env:jdkTempHome/jlink `
         --strip-java-debug-attributes `
         $options `
         --add-modules ALL-MODULE-PATH `