From aa6ec1e75fde114f612da207262ca2c26567cf7b Mon Sep 17 00:00:00 2001
From: "Kenneth P. Salerno" <kennethsalerno@yahoo.com>
Date: Tue, 30 Jan 2024 10:17:05 -0500
Subject: [PATCH 1/3] Removing jdk21-preview images, Adding jdk21 images

---
 docker-bake.hcl | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index 76ee24dae7..d63dd8348d 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -42,8 +42,10 @@ group "linux-ppc64le" {
   targets = [
     "debian_jdk11",
     "debian_jdk17",
-    "debian_jdk21_preview",
+    "debian_jdk21",
+    "rhel_ubi8_jdk11",
     "rhel_ubi9_jdk17",
+    "rhel_ubi9_jdk21"
   ]
 }
 
@@ -287,7 +289,7 @@ target "debian_jdk21" {
   ]
   ## TODO: restore architectures when available for https://hub.docker.com/_/eclipse-temurin/tags?page=1&name=21-jdk-jammy
   # platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/arm/v7"]
-  platforms = ["linux/amd64", "linux/arm64"]
+  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
 }
 
 target "debian_jdk21_preview" {
@@ -308,7 +310,7 @@ target "debian_jdk21_preview" {
     tag_lts(false, "lts-jdk21-preview"),
     tag_lts(true, "lts-jdk21-preview")
   ]
-  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x", "linux/arm/v7"]
+  platforms = ["linux/amd64", "linux/arm64", "linux/s390x", "linux/arm/v7"]
 }
 
 target "debian_slim_jdk11" {
@@ -388,7 +390,7 @@ target "debian_slim_jdk21_preview" {
     tag_weekly(false, "slim-jdk21-preview"),
     tag_lts(false, "lts-slim-jdk21-preview"),
   ]
-  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le", "linux/s390x", "linux/arm/v7"]
+  platforms = ["linux/amd64", "linux/arm64", "linux/s390x", "linux/arm/v7"]
 }
 
 target "rhel_ubi8_jdk11" {
@@ -407,7 +409,7 @@ target "rhel_ubi8_jdk11" {
     tag_lts(false, "lts-rhel-ubi8-jdk11"),
     tag_lts(true, "lts-rhel-ubi8-jdk11")
   ]
-  platforms = ["linux/amd64", "linux/arm64"]
+  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
 }
 
 target "rhel_ubi9_jdk17" {

From f0964e0ba9c52bd43fb6cf3ec68bfee24d03a185 Mon Sep 17 00:00:00 2001
From: "Kenneth P. Salerno" <kennethsalerno@yahoo.com>
Date: Tue, 30 Jan 2024 11:49:20 -0500
Subject: [PATCH 2/3] As usual, Mark Waite is the voice of reason. Adding
 debian_slim images for ppc64le and removing the soon-to-be-deprecated ubi8
 jdk11 image.

---
 docker-bake.hcl | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index d63dd8348d..e32287cdf8 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -43,7 +43,8 @@ group "linux-ppc64le" {
     "debian_jdk11",
     "debian_jdk17",
     "debian_jdk21",
-    "rhel_ubi8_jdk11",
+    "debian_slim_jdk17",
+    "debian_slim_jdk21",
     "rhel_ubi9_jdk17",
     "rhel_ubi9_jdk21"
   ]
@@ -352,7 +353,7 @@ target "debian_slim_jdk17" {
     tag_lts(false, "lts-slim-jdk17"),
     tag_lts(true, "lts-slim"),
   ]
-  platforms = ["linux/amd64"]
+  platforms = ["linux/amd64", "linux/ppc64le"]
 }
 
 target "debian_slim_jdk21" {
@@ -371,7 +372,7 @@ target "debian_slim_jdk21" {
     tag_weekly(false, "slim-jdk21"),
     tag_lts(false, "lts-slim-jdk21"),
   ]
-  platforms = ["linux/amd64", "linux/arm64"]
+  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
 }
 
 target "debian_slim_jdk21_preview" {
@@ -409,7 +410,7 @@ target "rhel_ubi8_jdk11" {
     tag_lts(false, "lts-rhel-ubi8-jdk11"),
     tag_lts(true, "lts-rhel-ubi8-jdk11")
   ]
-  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
+  platforms = ["linux/amd64", "linux/arm64"]
 }
 
 target "rhel_ubi9_jdk17" {

From 2694e19e2f065c4d9581d9e612621ecd89a070a9 Mon Sep 17 00:00:00 2001
From: Mark Waite <mark.earl.waite@gmail.com>
Date: Tue, 30 Jan 2024 14:05:07 -0700
Subject: [PATCH 3/3] Drop Debian slim to reduce memory use in build

Adding Debian slim seems to increase memory use enough that the job is
consistently killed with an out of memory failure code.
---
 docker-bake.hcl | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index e32287cdf8..3968900d7d 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -43,10 +43,7 @@ group "linux-ppc64le" {
     "debian_jdk11",
     "debian_jdk17",
     "debian_jdk21",
-    "debian_slim_jdk17",
-    "debian_slim_jdk21",
     "rhel_ubi9_jdk17",
-    "rhel_ubi9_jdk21"
   ]
 }
 
@@ -353,7 +350,7 @@ target "debian_slim_jdk17" {
     tag_lts(false, "lts-slim-jdk17"),
     tag_lts(true, "lts-slim"),
   ]
-  platforms = ["linux/amd64", "linux/ppc64le"]
+  platforms = ["linux/amd64"]
 }
 
 target "debian_slim_jdk21" {
@@ -372,7 +369,7 @@ target "debian_slim_jdk21" {
     tag_weekly(false, "slim-jdk21"),
     tag_lts(false, "lts-slim-jdk21"),
   ]
-  platforms = ["linux/amd64", "linux/arm64", "linux/ppc64le"]
+  platforms = ["linux/amd64", "linux/arm64"]
 }
 
 target "debian_slim_jdk21_preview" {