From 7becf2f6b5d412f9aed25f2b702e96a784ca5d7a Mon Sep 17 00:00:00 2001
From: gounthar <gounthar@gmail.com>
Date: Thu, 21 Mar 2024 22:07:49 +0100
Subject: [PATCH] feat(JDK21) Use official Temurin build for linux/s390x

---
 docker-bake.hcl                  |  6 +++---
 updatecli/updatecli.d/jdk11.yaml | 12 ++++++------
 updatecli/updatecli.d/jdk17.yaml | 12 ++++++------
 updatecli/updatecli.d/jdk21.yaml | 11 +++++------
 4 files changed, 20 insertions(+), 21 deletions(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index a20677ec..33123f27 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -27,7 +27,7 @@ group "linux-arm32" {
 group "linux-s390x" {
   targets = [
     "debian_jdk11",
-    "debian_jdk21-preview"
+    "debian_jdk21"
   ]
 }
 
@@ -196,7 +196,7 @@ target "debian_jdk21" {
     "${REGISTRY}/${JENKINS_REPO}:latest-debian-jdk21",
     "${REGISTRY}/${JENKINS_REPO}:latest-jdk21",
   ]
-  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
+  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x"]
 }
 
 target "debian_jdk21-preview" {
@@ -215,5 +215,5 @@ target "debian_jdk21-preview" {
     "${REGISTRY}/${JENKINS_REPO}:latest-debian-jdk21-preview",
     "${REGISTRY}/${JENKINS_REPO}:latest-jdk21-preview",
   ]
-  platforms = ["linux/s390x", "linux/arm/v7"]
+  platforms = ["linux/arm/v7"]
 }
diff --git a/updatecli/updatecli.d/jdk11.yaml b/updatecli/updatecli.d/jdk11.yaml
index 2ff968b3..36cdea79 100644
--- a/updatecli/updatecli.d/jdk11.yaml
+++ b/updatecli/updatecli.d/jdk11.yaml
@@ -39,7 +39,7 @@ conditions:
     name: Check if the container image "eclipse-temurin:<jdk11LastVersion>-jdk-alpine" is available
     disablesourceinput: true
     spec:
-      architecture: amd64
+      architecture: linux/amd64
       image: eclipse-temurin
       tag: '{{source "jdk11LastVersion" }}-jdk-alpine'
   checkTemurinJDK11DebianDockerImages:
@@ -48,10 +48,10 @@ conditions:
     disablesourceinput: true
     spec:
       architectures:
-        - amd64
-        - arm64
-        - s390x
-        - arm/v7
+        - linux/amd64
+        - linux/arm64
+        - linux/s390x
+        - linux/arm/v7
       image: eclipse-temurin
       tag: '{{source "jdk11LastVersion" }}-jdk-jammy'
   checkTemurinJDK11WindowsCoreDockerImage:
@@ -59,7 +59,7 @@ conditions:
     name: Check if the container image "eclipse-temurin:<jdk11LastVersion>-jdk-windowsservercore-1809" is available
     disablesourceinput: true
     spec:
-      architecture: amd64
+      architecture: windows/amd64
       image: eclipse-temurin
       tag: '{{source "jdk11LastVersion" }}-jdk-windowsservercore-1809'
 
diff --git a/updatecli/updatecli.d/jdk17.yaml b/updatecli/updatecli.d/jdk17.yaml
index ee3ef991..399464c0 100644
--- a/updatecli/updatecli.d/jdk17.yaml
+++ b/updatecli/updatecli.d/jdk17.yaml
@@ -39,7 +39,7 @@ conditions:
     name: Check if the container image "eclipse-temurin:<jdk17LastVersion>-jdk-alpine" is available
     disablesourceinput: true
     spec:
-      architecture: amd64
+      architecture: linux/amd64
       image: eclipse-temurin
       tag: '{{source "jdk17LastVersion" }}-jdk-alpine'
   checkTemurinJDK17DebianDockerImages:
@@ -48,10 +48,10 @@ conditions:
     disablesourceinput: true
     spec:
       architectures:
-        - amd64
-        - arm64
-        - s390x
-        - arm/v7
+        - linux/amd64
+        - linux/arm64
+        - linux/s390x
+        - linux/arm/v7
       image: eclipse-temurin
       tag: '{{source "jdk17LastVersion" }}-jdk-jammy'
   checkTemurinJDK17WindowsCoreDockerImage:
@@ -59,7 +59,7 @@ conditions:
     name: Check if the container image "eclipse-temurin:<jdk17LastVersion>-jdk-windowsservercore-1809" is available
     disablesourceinput: true
     spec:
-      architecture: amd64
+      architecture: windows/amd64
       image: eclipse-temurin
       tag: '{{source "jdk17LastVersion" }}-jdk-windowsservercore-1809'
 
diff --git a/updatecli/updatecli.d/jdk21.yaml b/updatecli/updatecli.d/jdk21.yaml
index 23c61f21..a6fcd31d 100644
--- a/updatecli/updatecli.d/jdk21.yaml
+++ b/updatecli/updatecli.d/jdk21.yaml
@@ -39,7 +39,7 @@ conditions:
     name: Check if the container image "eclipse-temurin:<jdk21LastVersion>-jdk-alpine" is available
     disablesourceinput: true
     spec:
-      architecture: amd64
+      architecture: linux/amd64
       image: eclipse-temurin
       tag: '{{source "jdk21LastVersion" }}-jdk-alpine'
   checkTemurinJDK21DebianDockerImages:
@@ -48,10 +48,9 @@ conditions:
     disablesourceinput: true
     spec:
       architectures:
-        - amd64
-        - arm64
-        - s390x
-        - arm/v7
+        - linux/amd64
+        - linux/arm64
+        - linux/s390x
       image: eclipse-temurin
       tag: '{{source "jdk21LastVersion" }}-jdk-jammy'
   checkTemurinJDK21WindowsCoreDockerImage:
@@ -59,7 +58,7 @@ conditions:
     name: Check if the container image "eclipse-temurin:<jdk21LastVersion>-jdk-windowsservercore-1809" is available
     disablesourceinput: true
     spec:
-      architecture: amd64
+      architecture: windows/amd64
       image: eclipse-temurin
       tag: '{{source "jdk21LastVersion" }}-jdk-windowsservercore-1809'