chore(windows): use docker bake to generate the docker compose file

Author: lemeurherve

.gitignore

@@ -16,4 +16,6 @@ work-pester-jenkins-windows/
 /**/windows/**/jenkins-plugin-cli.ps1
 /**/windows/**/jenkins-support.psm1
 
+build-windows_*.yaml
+
 tests/**/Dockerfile\.*

Jenkinsfile

@@ -64,6 +64,7 @@ stage('Build') {
                             stage("Build ${imageType}") {
                                 infra.withDockerCredentials {
                                     powershell './make.ps1 build'
+                                    archiveArtifacts artifacts: 'build-windows_*.yaml', allowEmptyArchive: true
                                 }
                             }
 
@@ -117,7 +118,7 @@ stage('Build') {
 
         if (!infra.isTrusted()) {
             // This list can be updated with the following command:
-            // make show | jq -r '.target | keys[]' | sort
+            // make show-linux | jq -r '.target | keys[]' | sort
             def images = [
                 'alpine_jdk17',
                 'alpine_jdk21',

Makefile

@@ -9,7 +9,17 @@ export BUILDKIT_PROGRESS=plain
 ## Required to have the commit SHA added as a Docker image label
 export COMMIT_SHA=$(shell git rev-parse HEAD)
 
+current_os := $(shell uname -s)
 current_arch := $(shell uname -m)
+
+export OS := $(shell \
+	case "$(current_os)" in \
+		(Linux) echo linux ;; \
+		(Darwin) echo linux ;; \
+		(MINGW*|MSYS*|CYGWIN*) echo windows ;; \
+		(*) echo unknown ;; \
+	esac)
+
 export ARCH ?= $(shell \
 	case $(current_arch) in \
 		(x86_64) echo "amd64" ;; \
@@ -31,7 +41,7 @@ TEST_SUITES ?= $(CURDIR)/tests
 ## Check the presence of a CLI in the current PATH
 check_cli = type "$(1)" >/dev/null 2>&1 || { echo "Error: command '$(1)' required but not found. Exiting." ; exit 1 ; }
 ## Check if a given image exists in the current manifest docker-bake.hcl
-check_image = make --silent list | grep -w '$(1)' >/dev/null 2>&1 || { echo "Error: the image '$(1)' does not exist in manifest for the platform 'linux/$(ARCH)'. Please check the output of 'make list'. Exiting." ; exit 1 ; }
+check_image = make --silent list | grep -w '$(1)' >/dev/null 2>&1 || { echo "Error: the image '$(1)' does not exist in manifest for the current platform '$(OS)/$(ARCH)'. Please check the output of 'make list'. Exiting." ; exit 1 ; }
 ## Base "docker buildx base" command to be reused everywhere
 bake_base_cli := docker buildx bake -f docker-bake.hcl --load
 
@@ -70,36 +80,48 @@ hadolint:
 shellcheck:
 	@$(ROOT_DIR)/tools/shellcheck -e SC1091 jenkins-support *.sh tests/test_helpers.bash tools/hadolint tools/shellcheck .ci/publish.sh
 
-# Build targets depending on the current architecture
+# Build targets depending on the current OS and architecture
 build: check-reqs
-	@set -x; $(bake_base_cli) --set '*.platform=linux/$(ARCH)' $(shell make --silent list)
+	@set -x; $(bake_base_cli) --set '*.platform=$(OS)/$(ARCH)' $(shell make --silent list)
 
-# Build targets depending on the architecture
+# Build targets depending on the architecture (Linux only, no multiarch for Windows)
 buildarch-%: check-reqs
 	@$(bake_base_cli) --set '*.platform=linux/$*' $(shell make --silent listarch-$*)
 
 # Build a specific target with the current architecture
 build-%: check-reqs
 	@$(call check_image,$*)
-	@set -x; $(bake_base_cli) --set '*.platform=linux/$(ARCH)' '$*'
+	@set -x; $(bake_base_cli) --set '*.platform=$(OS)/$(ARCH)' '$*'
 
 # Show all targets
 show:
-	@$(bake_base_cli) --progress=quiet linux --print | jq
+	@$(bake_base_cli) --progress=quiet all --print | jq
 
-# List all tags
+# Show a specific target
+show-%:
+	@$(bake_base_cli) --progress=quiet '$*' --print | jq
+
+# List tags of all targets
 tags:
 	@make show | jq -r ' .target | to_entries[] | .key as $$name | .value.tags[] | "\(.) (\($$name))"' | LC_ALL=C sort -u
 
+# List tags of a specific target
+tags-%:
+	@make show-$* | jq -r ' .target | to_entries[] | .key as $$name | .value.tags[] | "\(.) (\($$name))"' | LC_ALL=C sort -u
+
 # List all platforms
 platforms:
 	@make show | jq -r ' .target | to_entries[] | .key as $$name | .value.platforms[] | "\($$name):\(.)"' | LC_ALL=C sort -u
 
-# Return the list of targets depending on the current architecture
+# List platforms of a specific target
+platforms-%:
+	@make show-$* | jq -r ' .target | to_entries[] | .key as $$name | .value.platforms[] | "\($$name):\(.)"' | LC_ALL=C sort -u
+
+# Return the list of targets depending on the current OS and architecture
 list: check-reqs
-	@set -x; make --silent show | jq -r '.target | path(.. | select(.platforms[] | contains("linux/$(ARCH)"))?) | add'
+	@set -x; make --silent show | jq -r '.target | path(.. | select(.platforms[] | contains("$(OS)/$(ARCH)"))?) | add'
 
-# Return the list of targets depending on the architecture
+# Return the list of targets depending on the architecture (Linux only, no multiarch for Windows)
 listarch-%: check-reqs
 	@make --silent show | jq -r '.target | path(.. | select(.platforms[] | contains("linux/$*"))?) | add'
 

build-windows.yaml

@@ -83,6 +83,11 @@ variable "RHEL_RELEASE_LINE" {
   default = "ubi9"
 }
 
+# Set this value to a specific Windows version to override Windows versions to build returned by windowsversions function
+variable "WINDOWS_VERSION_OVERRIDE" {
+  default = ""
+}
+
 ## Internal variables
 variable "jdk_versions" {
   default = {
@@ -165,6 +170,28 @@ target "rhel" {
   platforms = platforms(current_rhel, jdk)
 }
 
+target "windowsservercore" {
+  matrix = {
+    jdk             = jdks_to_build()
+    windows_version = windowsversions("windowsservercore")
+  }
+  name       = "windowsservercore_jdk${jdk}"
+  dockerfile = "windows/windowsservercore/hotspot/Dockerfile"
+  context    = "."
+  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       = javaversion(jdk)
+    JAVA_HOME          = "C:/openjdk-${jdk}"
+    WINDOWS_VERSION    = windows_version
+  }
+  tags      = windows_tags("windowsservercore-${windows_version}", jdk)
+  platforms = ["windows/amd64"]
+}
+
 ## Groups
 group "linux" {
   targets = [
@@ -174,6 +201,19 @@ group "linux" {
   ]
 }
 
+group "windows" {
+  targets = [
+    "windowsservercore"
+  ]
+}
+
+group "all" {
+  targets = [
+    "linux",
+    "windows",
+  ]
+}
+
 ## Common functions
 # return true if JENKINS_VERSION is a Weekly (one sequence of digits with a trailing literal '.')
 function "is_jenkins_version_weekly" {
@@ -290,6 +330,25 @@ function "linux_tags" {
   )
 }
 
+# Return an array of tags depending on the agent type, the jdk
+# and the flavor and version of Windows passed as parameters (ex: windowsservercore-ltsc2022)
+function "windows_tags" {
+  params = [distribution, jdk]
+  result = [
+    ## Always publish explicit jdk tag
+    tag(true, "jdk${jdk}-hotspot-${distribution}"),
+    tag_weekly(false, "jdk${jdk}-hotspot-${distribution}"),
+    tag_lts(false, "lts-jdk${jdk}-hotspot-${distribution}"),
+
+    # ## Default JDK extra short tags
+    is_default_jdk(jdk) ? tag(true, "hotspot-${distribution}") : "",
+    is_default_jdk(jdk) ? tag_weekly(false, distribution) : "",
+    is_default_jdk(jdk) ? tag_weekly(true, distribution) : "",
+    is_default_jdk(jdk) ? tag_lts(false, "lts-${distribution}") : "",
+    is_default_jdk(jdk) ? tag_lts(true, distribution) : "",
+  ]
+}
+
 # Return if the distribution passed in parameter is Alpine
 function "is_alpine" {
   params = [distribution]
@@ -351,3 +410,11 @@ function "debian_tags" {
     is_default_jdk(jdk) ? tag_lts(true, slim_suffix(variant, "lts")) : "",
   ]
 }
+
+# Return array of Windows version(s) to build
+# Can be overriden by setting WINDOWS_VERSION_OVERRIDE to a specific Windows version
+# Ex: WINDOWS_VERSION_OVERRIDE=ltsc2025 docker buildx bake windows
+function "windowsversions" {
+  params = [flavor]
+  result = notequal(WINDOWS_VERSION_OVERRIDE, "") ? [WINDOWS_VERSION_OVERRIDE] : ["ltsc2022"]
+}