From ea3363a484b1e2a93d3924ca7e8604e01a7a69e9 Mon Sep 17 00:00:00 2001 From: "Kenneth P. Salerno" <126820561+ksalerno99@users.noreply.github.com> Date: Tue, 30 Jan 2024 19:01:20 -0500 Subject: [PATCH] Remove ppc64le jdk21-preview images, add jdk21 images (#1823) * Removing jdk21-preview images, Adding jdk21 images * 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. * 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. --------- Co-authored-by: Mark Waite --- docker-bake.hcl | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/docker-bake.hcl b/docker-bake.hcl index 76ee24dae7..3968900d7d 100644 --- a/docker-bake.hcl +++ b/docker-bake.hcl @@ -42,7 +42,7 @@ group "linux-ppc64le" { targets = [ "debian_jdk11", "debian_jdk17", - "debian_jdk21_preview", + "debian_jdk21", "rhel_ubi9_jdk17", ] } @@ -287,7 +287,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 +308,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 +388,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" {