From 4efbd5997f9454e7a09d3245a917df8ffec83f48 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?=
 <91831478+lemeurherve@users.noreply.github.com>
Date: Mon, 23 Oct 2023 16:28:30 +0200
Subject: [PATCH 1/2] chore: add `debian_jdk21_preview` to the "linux" group in
 docker-bake

---
 docker-bake.hcl | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docker-bake.hcl b/docker-bake.hcl
index d333f061..f4888c70 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -6,6 +6,7 @@ group "linux" {
     "debian_jdk11",
     "debian_jdk17",
     "debian_jdk21",
+    "debian_jdk21_preview",
   ]
 }
 

From 5a26a7fa96dcb5286c8521977c4d076861df7b84 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Herv=C3=A9=20Le=20Meur?= <lemeurherve.jenkins@gmail.com>
Date: Mon, 23 Oct 2023 16:59:13 +0200
Subject: [PATCH 2/2] fix parent image version

---
 debian/preview/Dockerfile | 2 +-
 docker-bake.hcl           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/debian/preview/Dockerfile b/debian/preview/Dockerfile
index 5e45facc..6319a712 100644
--- a/debian/preview/Dockerfile
+++ b/debian/preview/Dockerfile
@@ -1,4 +1,4 @@
-ARG version=3180.v3dd999d24861-2-preview
+ARG version=3180.v3dd999d24861-2
 ARG JAVA_MAJOR_VERSION=21
 FROM jenkins/agent:"${version}"-jdk"${JAVA_MAJOR_VERSION}-preview"
 
diff --git a/docker-bake.hcl b/docker-bake.hcl
index f4888c70..116fa133 100644
--- a/docker-bake.hcl
+++ b/docker-bake.hcl
@@ -164,7 +164,7 @@ target "debian_jdk21_preview" {
   context    = "."
   args = {
     JAVA_MAJOR_VERSION = "21"
-    version            = "${PARENT_IMAGE_VERSION}-preview"
+    version            = "${PARENT_IMAGE_VERSION}"
   }
   tags = [
     equal(ON_TAG, "true") ? "${REGISTRY}/${JENKINS_REPO}:${PARENT_IMAGE_VERSION}-jdk21-preview" : "",