Merge branch 'master' into windows-digest

.github/workflows/updatecli.yaml

@@ -15,7 +15,7 @@ jobs:
         uses: actions/checkout@v4
 
       - name: Install Updatecli in the runner
-        uses: updatecli/updatecli-action@v2.60.0
+        uses: updatecli/updatecli-action@v2.61.0
 
       - name: Run Updatecli in Dry Run mode
         run: updatecli diff --config ./updatecli/updatecli.d --values ./updatecli/values.github-action.yaml --values ./updatecli/values.temurin.yaml

alpine/Dockerfile

@@ -21,7 +21,7 @@
 # SOFTWARE.
 
 ARG JAVA_VERSION=17.0.11_9
-ARG ALPINE_TAG=3.20.0
+ARG ALPINE_TAG=3.20.1
 FROM alpine:"${ALPINE_TAG}" AS jre-build
 
 SHELL ["/bin/ash", "-eo", "pipefail", "-c"]

docker-bake.hcl

@@ -57,7 +57,7 @@ variable "VERSION" {
 }
 
 variable "ALPINE_FULL_TAG" {
-  default = "3.20.0"
+  default = "3.20.1"
 }
 
 variable "ALPINE_SHORT_TAG" {
@@ -99,7 +99,7 @@ function "javaversion" {
     ? "${JAVA11_VERSION}"
     : (equal(17, jdk)
       ? "${JAVA17_VERSION}"
-      : "${JAVA21_VERSION}"))
+  : "${JAVA21_VERSION}"))
 }
 
 ## Specific functions
@@ -108,15 +108,15 @@ function "alpine_platforms" {
   params = [jdk]
   result = (equal(21, jdk)
     ? ["linux/amd64", "linux/arm64"]
-    : ["linux/amd64"])
+  : ["linux/amd64"])
 }
 
 # Return an array of Debian platforms to use depending on the jdk passed as parameter
 function "debian_platforms" {
   params = [jdk]
   result = (equal(17, jdk)
     ? ["linux/amd64", "linux/arm64", "linux/ppc64le"]
-    : ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"])
+  : ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"])
 }
 
 # Return array of Windows version(s) to build
@@ -129,7 +129,7 @@ function "windowsversions" {
     ? [WINDOWS_VERSION_OVERRIDE]
     : (equal(flavor, "windowsservercore")
       ? ["ltsc2019", "ltsc2022"]
-      : ["1809", "ltsc2019", "ltsc2022"]))
+  : ["1809", "ltsc2019", "ltsc2022"]))
 }
 
 # Return the Windows version to use as base image for the Windows version passed as parameter
@@ -138,7 +138,7 @@ function "toolsversion" {
   params = [version]
   result = (equal("ltsc2019", version)
     ? "1809"
-    : version)
+  : version)
 }
 
 # Return the Windows version digest to use for windowsservercore ltsc2019 image
@@ -207,19 +207,19 @@ target "debian" {
 
 target "nanoserver" {
   matrix = {
-    jdk = jdks_to_build
+    jdk             = jdks_to_build
     windows_version = windowsversions("nanoserver")
   }
   name       = "nanoserver-${windows_version}_jdk${jdk}"
   dockerfile = "windows/nanoserver/Dockerfile"
   context    = "."
   args = {
-    JAVA_HOME = "C:/openjdk-${jdk}"
-    JAVA_VERSION   = "${replace(javaversion(jdk), "_", "+")}"
+    JAVA_HOME             = "C:/openjdk-${jdk}"
+    JAVA_VERSION          = "${replace(javaversion(jdk), "_", "+")}"
     TOOLS_WINDOWS_VERSION = "${toolsversion(windows_version)}"
     # TODO: workaround, to be removed when https://github.com/microsoft/Windows-Containers/issues/493 is resolved
     WINDOWS_VERSION_DIGEST = windowsversiondigest(windows_version)
-    WINDOWS_VERSION_TAG = windows_version
+    WINDOWS_VERSION_TAG    = windows_version
   }
   tags = [
     # If there is a tag, add versioned tag suffixed by the jdk
@@ -234,19 +234,19 @@ target "nanoserver" {
 
 target "windowsservercore" {
   matrix = {
-    jdk = jdks_to_build
+    jdk             = jdks_to_build
     windows_version = windowsversions("windowsservercore")
   }
   name       = "windowsservercore-${windows_version}_jdk${jdk}"
   dockerfile = "windows/windowsservercore/Dockerfile"
   context    = "."
   args = {
-    JAVA_HOME = "C:/openjdk-${jdk}"
-    JAVA_VERSION   = "${replace(javaversion(jdk), "_", "+")}"
+    JAVA_HOME             = "C:/openjdk-${jdk}"
+    JAVA_VERSION          = "${replace(javaversion(jdk), "_", "+")}"
     TOOLS_WINDOWS_VERSION = "${toolsversion(windows_version)}"
     # TODO: workaround, to be removed when https://github.com/microsoft/Windows-Containers/issues/493 is resolved
     WINDOWS_VERSION_DIGEST = windowsversiondigest(windows_version)
-    WINDOWS_VERSION_TAG = windows_version
+    WINDOWS_VERSION_TAG    = windows_version
   }
   tags = [
     # If there is a tag, add versioned tag suffixed by the jdk