From 432751ec8a68a0e51a482a9de2dfbe57131278fb Mon Sep 17 00:00:00 2001
From: Poon Yat Sing <ypoon@lycorp.co.jp>
Date: Wed, 7 Jan 2026 14:08:21 +0900
Subject: [PATCH 1/2] Retry JDK download in Docker image build

---
 docker/Dockerfile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 054c823b0..77f318e53 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -26,7 +26,9 @@ RUN \
     # Install JDK from the provided archive link \
     echo "Downloading JDK from ${JDK_DOWNLOAD_LINK}" && \
     mkdir -p "${JAVA_HOME}" && \
-    curl -#LfS "${JDK_DOWNLOAD_LINK}" | tar -zx --strip 1 -C "${JAVA_HOME}"
+    curl -#LfS --retry 8 "${JDK_DOWNLOAD_LINK}" -o /jdktarfile && \
+    tar -zxf /jdktarfile --strip 1 -C "${JAVA_HOME}" && \
+    echo "Done"
 
 FROM ${TRINO_GATEWAY_BUILD_IMAGE} AS packages
 

From 13f3b94e3c97f2fa6a925b4fb56d84afcc839edf Mon Sep 17 00:00:00 2001
From: Poon Yat Sing <ypoon@lycorp.co.jp>
Date: Wed, 7 Jan 2026 14:51:37 +0900
Subject: [PATCH 2/2] Use native arch to download and extract JDK

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 77f318e53..5a0e5e7f2 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -15,7 +15,7 @@
 ARG TRINO_GATEWAY_BASE_IMAGE
 ARG TRINO_GATEWAY_BUILD_IMAGE
 
-FROM ${TRINO_GATEWAY_BUILD_IMAGE} AS jdk-download
+FROM --platform=$BUILDPLATFORM ${TRINO_GATEWAY_BUILD_IMAGE} AS jdk-download
 ARG JDK_DOWNLOAD_LINK
 ARG JDK_RELEASE_NAME
 ENV JAVA_HOME="/usr/lib/jvm/jdk-${JDK_RELEASE_NAME}"