Update amazoncorretto: replace uname -m with rpm --query by mmm-choi · Pull Request #21168 · docker-library/official-images

mmm-choi · 2026-04-03T16:05:43Z

Summary

Update GitCommit for amazoncorretto to point to corretto/corretto-docker commit 08df98dad1cbed8f8f0f227c10b7b7a3d8c1a57e.

This commit replaces $(uname -m) with rpm --query --queryformat='%{ARCH}' rpm in all AL2 and AL2023 Dockerfiles, addressing feedback from @tianon on PR #21053:

Queries userspace architecture instead of kernel architecture
Captures the result in a variable for proper error propagation under set -eux

See: corretto/corretto-docker#274

Update GitCommit to point to corretto/corretto-docker commit that replaces uname -m with rpm --query for userspace architecture detection in AL2/AL2023 Dockerfiles.

github-actions · 2026-04-03T16:07:12Z

Diff for 2dd150b:

diff --git a/_bashbrew-cat b/_bashbrew-cat
index b03de93..90c13c3 100644
--- a/_bashbrew-cat
+++ b/_bashbrew-cat
@@ -1,7 +1,7 @@
 Maintainers: Amazon Corretto Team <corretto-team@amazon.com> (@corretto), Dan Lutker <lutkerd@amazon.com> (@lutkerd), Ben Taylor <benty@amazon.com> (@benty-amzn), David Alvarez <alvdavi@amazon.com> (@alvdavi), Rui Li <ruiamzn@amazon.com> (@rgithubli), Sergey Bylokhov <bylokhov@amazon.com> (@mrserb), Victor Rudometov <vicrud@amazon.com> (@Rudometov), Elif Aslan <elifasln@amazon.com> (@elifaslan1), Chad Rakoczy <chadrako@amazon.com> (@chadrako), Ian Myers <ianrichr@amazon.com> (@ianrichr), John Spurling <spurn@amazon.com> (@synecdoche), Daniel Hu <costmuch@amazon.com> (@cost0much), Michael De Vera <mldevera@amazon.com> (@midver), Min Choi <minschoi@amazon.com> (@mmm-choi), Satyen Subramaniam <satyenme@amazon.com> (@satyenme)
 GitRepo: https://github.com/corretto/corretto-docker.git
 GitFetch: refs/heads/main
-GitCommit: b96e13a7da2cf50ccd332b3f18e280d2068dfbeb
+GitCommit: 08df98dad1cbed8f8f0f227c10b7b7a3d8c1a57e
 
 Tags: 8, 8u482, 8u482-al2, 8-al2-full, 8-al2-jdk, 8-al2-generic, 8u482-al2-generic, 8-al2-generic-jdk, latest
 Architectures: amd64, arm64v8
diff --git a/amazoncorretto_11-al2023-jdk/Dockerfile b/amazoncorretto_11-al2023-jdk/Dockerfile
index db604c3..8e92e8e 100644
--- a/amazoncorretto_11-al2023-jdk/Dockerfile
+++ b/amazoncorretto_11-al2023-jdk/Dockerfile
@@ -3,18 +3,19 @@ FROM amazonlinux:2023
 ARG version=11.0.30.7-1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-11-amazon-corretto-headless-$version.amzn2023.$(uname -m).rpm" "java-11-amazon-corretto-$version.amzn2023.$(uname -m).rpm" "java-11-amazon-corretto-devel-$version.amzn2023.$(uname -m).rpm" "java-11-amazon-corretto-jmods-$version.amzn2023.$(uname -m).rpm") \
+    && RPM_LIST=("java-11-amazon-corretto-headless-$version.amzn2023.${ARCH}.rpm" "java-11-amazon-corretto-$version.amzn2023.${ARCH}.rpm" "java-11-amazon-corretto-devel-$version.amzn2023.${ARCH}.rpm" "java-11-amazon-corretto-jmods-$version.amzn2023.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-11-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-11-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_11.0.30-al2-native-headless/Dockerfile b/amazoncorretto_11.0.30-al2-native-headless/Dockerfile
index 74547db..db1f9fe 100644
--- a/amazoncorretto_11.0.30-al2-native-headless/Dockerfile
+++ b/amazoncorretto_11.0.30-al2-native-headless/Dockerfile
@@ -3,12 +3,13 @@ FROM amazonlinux:2
 ARG version=11.0.30.7-1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && export resouce_version=$(echo $version | tr '-' '.') \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2 \
     && echo "localpkg_gpgcheck=1" >> /etc/yum.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-11-amazon-corretto-headless-$version.amzn2.$(uname -m).rpm") \
+    && RPM_LIST=("java-11-amazon-corretto-headless-$version.amzn2.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/${resouce_version}/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: rsa sha1 (md5) pgp md5 OK" || exit 1 \
@@ -16,7 +17,7 @@ RUN set -eux \
     done \
     && rpm -i --nodeps ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && (find /usr/lib/jvm/java-11-amazon-corretto.$(uname -m) -name src.zip -delete || true) \
+    && (find /usr/lib/jvm/java-11-amazon-corretto.${ARCH} -name src.zip -delete || true) \
     && rm -rf ${CORRETO_TEMP} \
     && yum clean all \
     && rm -rf /var/cache/yum \
diff --git a/amazoncorretto_11.0.30-al2-native-jdk/Dockerfile b/amazoncorretto_11.0.30-al2-native-jdk/Dockerfile
index e5b41d4..bd51952 100644
--- a/amazoncorretto_11.0.30-al2-native-jdk/Dockerfile
+++ b/amazoncorretto_11.0.30-al2-native-jdk/Dockerfile
@@ -3,12 +3,13 @@ FROM amazonlinux:2
 ARG version=11.0.30.7-1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && export resouce_version=$(echo $version | tr '-' '.') \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2 \
     && echo "localpkg_gpgcheck=1" >> /etc/yum.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-11-amazon-corretto-headless-$version.amzn2.$(uname -m).rpm" "java-11-amazon-corretto-$version.amzn2.$(uname -m).rpm") \
+    && RPM_LIST=("java-11-amazon-corretto-headless-$version.amzn2.${ARCH}.rpm" "java-11-amazon-corretto-$version.amzn2.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/${resouce_version}/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: rsa sha1 (md5) pgp md5 OK" || exit 1 \
@@ -16,7 +17,7 @@ RUN set -eux \
     done \
     && rpm -i --nodeps ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && (find /usr/lib/jvm/java-11-amazon-corretto.$(uname -m) -name src.zip -delete || true) \
+    && (find /usr/lib/jvm/java-11-amazon-corretto.${ARCH} -name src.zip -delete || true) \
     && rm -rf ${CORRETO_TEMP} \
     && yum clean all \
     && rm -rf /var/cache/yum \
diff --git a/amazoncorretto_11.0.30-al2023-headful/Dockerfile b/amazoncorretto_11.0.30-al2023-headful/Dockerfile
index e682031..fade468 100644
--- a/amazoncorretto_11.0.30-al2023-headful/Dockerfile
+++ b/amazoncorretto_11.0.30-al2023-headful/Dockerfile
@@ -2,18 +2,19 @@ FROM amazonlinux:2023
 
 ARG version=11.0.30.7-1
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-11-amazon-corretto-headless-$version.amzn2023.$(uname -m).rpm" "java-11-amazon-corretto-$version.amzn2023.$(uname -m).rpm") \
+    && RPM_LIST=("java-11-amazon-corretto-headless-$version.amzn2023.${ARCH}.rpm" "java-11-amazon-corretto-$version.amzn2023.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-11-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-11-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_11.0.30-al2023-headless/Dockerfile b/amazoncorretto_11.0.30-al2023-headless/Dockerfile
index c0d8a6c..ca1f6a8 100644
--- a/amazoncorretto_11.0.30-al2023-headless/Dockerfile
+++ b/amazoncorretto_11.0.30-al2023-headless/Dockerfile
@@ -2,18 +2,19 @@ FROM amazonlinux:2023
 
 ARG version=11.0.30.7-1
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-11-amazon-corretto-headless-$version.amzn2023.$(uname -m).rpm") \
+    && RPM_LIST=("java-11-amazon-corretto-headless-$version.amzn2023.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-11-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-11-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_17-al2023-jdk/Dockerfile b/amazoncorretto_17-al2023-jdk/Dockerfile
index 64f4767..8466ffa 100644
--- a/amazoncorretto_17-al2023-jdk/Dockerfile
+++ b/amazoncorretto_17-al2023-jdk/Dockerfile
@@ -4,18 +4,19 @@ ARG version=17.0.18.9-1
 ARG package_version=1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-17-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-17-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-17-amazon-corretto-devel-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-17-amazon-corretto-jmods-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-17-amazon-corretto-headless-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-17-amazon-corretto-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-17-amazon-corretto-devel-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-17-amazon-corretto-jmods-$version.amzn2023.${package_version}.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-17-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-17-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_17.0.18-al2-native-headful/Dockerfile b/amazoncorretto_17.0.18-al2-native-headful/Dockerfile
index 9e64fa3..a838e58 100644
--- a/amazoncorretto_17.0.18-al2-native-headful/Dockerfile
+++ b/amazoncorretto_17.0.18-al2-native-headful/Dockerfile
@@ -3,12 +3,13 @@ FROM amazonlinux:2
 ARG version=17.0.18.9-1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && export resouce_version=$(echo $version | tr '-' '.') \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2 \
     && echo "localpkg_gpgcheck=1" >> /etc/yum.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-17-amazon-corretto-headless-$version.amzn2.1.$(uname -m).rpm" "java-17-amazon-corretto-$version.amzn2.1.$(uname -m).rpm") \
+    && RPM_LIST=("java-17-amazon-corretto-headless-$version.amzn2.1.${ARCH}.rpm" "java-17-amazon-corretto-$version.amzn2.1.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/${resouce_version}/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: rsa sha1 (md5) pgp md5 OK" || exit 1 \
@@ -16,7 +17,7 @@ RUN set -eux \
     done \
     && rpm -i --nodeps ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && (find /usr/lib/jvm/java-17-amazon-corretto.$(uname -m) -name src.zip -delete || true) \
+    && (find /usr/lib/jvm/java-17-amazon-corretto.${ARCH} -name src.zip -delete || true) \
     && rm -rf ${CORRETO_TEMP} \
     && yum clean all \
     && rm -rf /var/cache/yum \
diff --git a/amazoncorretto_17.0.18-al2-native-headless/Dockerfile b/amazoncorretto_17.0.18-al2-native-headless/Dockerfile
index 4d50715..ad3a366 100644
--- a/amazoncorretto_17.0.18-al2-native-headless/Dockerfile
+++ b/amazoncorretto_17.0.18-al2-native-headless/Dockerfile
@@ -3,12 +3,13 @@ FROM amazonlinux:2
 ARG version=17.0.18.9-1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && export resouce_version=$(echo $version | tr '-' '.') \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2 \
     && echo "localpkg_gpgcheck=1" >> /etc/yum.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-17-amazon-corretto-headless-$version.amzn2.1.$(uname -m).rpm") \
+    && RPM_LIST=("java-17-amazon-corretto-headless-$version.amzn2.1.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/${resouce_version}/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: rsa sha1 (md5) pgp md5 OK" || exit 1 \
@@ -16,7 +17,7 @@ RUN set -eux \
     done \
     && rpm -i --nodeps ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && (find /usr/lib/jvm/java-17-amazon-corretto.$(uname -m) -name src.zip -delete || true) \
+    && (find /usr/lib/jvm/java-17-amazon-corretto.${ARCH} -name src.zip -delete || true) \
     && rm -rf ${CORRETO_TEMP} \
     && yum clean all \
     && rm -rf /var/cache/yum \
diff --git a/amazoncorretto_17.0.18-al2-native-jdk/Dockerfile b/amazoncorretto_17.0.18-al2-native-jdk/Dockerfile
index 535619a..7ed9306 100644
--- a/amazoncorretto_17.0.18-al2-native-jdk/Dockerfile
+++ b/amazoncorretto_17.0.18-al2-native-jdk/Dockerfile
@@ -3,12 +3,13 @@ FROM amazonlinux:2
 ARG version=17.0.18.9-1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && export resouce_version=$(echo $version | tr '-' '.') \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2 \
     && echo "localpkg_gpgcheck=1" >> /etc/yum.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-17-amazon-corretto-headless-$version.amzn2.1.$(uname -m).rpm" "java-17-amazon-corretto-$version.amzn2.1.$(uname -m).rpm" "java-17-amazon-corretto-devel-$version.amzn2.1.$(uname -m).rpm" "java-17-amazon-corretto-jmods-$version.amzn2.1.$(uname -m).rpm") \
+    && RPM_LIST=("java-17-amazon-corretto-headless-$version.amzn2.1.${ARCH}.rpm" "java-17-amazon-corretto-$version.amzn2.1.${ARCH}.rpm" "java-17-amazon-corretto-devel-$version.amzn2.1.${ARCH}.rpm" "java-17-amazon-corretto-jmods-$version.amzn2.1.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/${resouce_version}/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: rsa sha1 (md5) pgp md5 OK" || exit 1 \
@@ -18,7 +19,7 @@ RUN set -eux \
       done \
     && rpm -i --nodeps ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && (find /usr/lib/jvm/java-17-amazon-corretto.$(uname -m) -name src.zip -delete || true) \
+    && (find /usr/lib/jvm/java-17-amazon-corretto.${ARCH} -name src.zip -delete || true) \
     && rm -rf ${CORRETO_TEMP} \
     && yum clean all \
     && rm -rf /var/cache/yum \
diff --git a/amazoncorretto_17.0.18-al2023-headful/Dockerfile b/amazoncorretto_17.0.18-al2023-headful/Dockerfile
index 81cf5cc..c0dea1e 100644
--- a/amazoncorretto_17.0.18-al2023-headful/Dockerfile
+++ b/amazoncorretto_17.0.18-al2023-headful/Dockerfile
@@ -4,18 +4,19 @@ ARG version=17.0.18.9-1
 ARG package_version=1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-17-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-17-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-17-amazon-corretto-headless-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-17-amazon-corretto-$version.amzn2023.${package_version}.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-17-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-17-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_17.0.18-al2023-headless/Dockerfile b/amazoncorretto_17.0.18-al2023-headless/Dockerfile
index edc99a5..b089bb1 100644
--- a/amazoncorretto_17.0.18-al2023-headless/Dockerfile
+++ b/amazoncorretto_17.0.18-al2023-headless/Dockerfile
@@ -4,18 +4,19 @@ ARG version=17.0.18.9-1
 ARG package_version=1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-17-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-17-amazon-corretto-headless-$version.amzn2023.${package_version}.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-17-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-17-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_21-al2023-jdk/Dockerfile b/amazoncorretto_21-al2023-jdk/Dockerfile
index cb597c0..17f9cbb 100644
--- a/amazoncorretto_21-al2023-jdk/Dockerfile
+++ b/amazoncorretto_21-al2023-jdk/Dockerfile
@@ -4,18 +4,19 @@ ARG version=21.0.10.7-1
 ARG package_version=1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-21-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-21-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-21-amazon-corretto-devel-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-21-amazon-corretto-jmods-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-21-amazon-corretto-headless-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-21-amazon-corretto-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-21-amazon-corretto-devel-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-21-amazon-corretto-jmods-$version.amzn2023.${package_version}.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-21-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-21-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_21.0.10-al2023-headful/Dockerfile b/amazoncorretto_21.0.10-al2023-headful/Dockerfile
index 26cf713..d1b5f3a 100644
--- a/amazoncorretto_21.0.10-al2023-headful/Dockerfile
+++ b/amazoncorretto_21.0.10-al2023-headful/Dockerfile
@@ -4,18 +4,19 @@ ARG version=21.0.10.7-1
 ARG package_version=1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-21-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-21-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-21-amazon-corretto-headless-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-21-amazon-corretto-$version.amzn2023.${package_version}.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-21-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-21-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_21.0.10-al2023-headless/Dockerfile b/amazoncorretto_21.0.10-al2023-headless/Dockerfile
index 267d56c..92c38fb 100644
--- a/amazoncorretto_21.0.10-al2023-headless/Dockerfile
+++ b/amazoncorretto_21.0.10-al2023-headless/Dockerfile
@@ -4,18 +4,19 @@ ARG version=21.0.10.7-1
 ARG package_version=1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-21-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-21-amazon-corretto-headless-$version.amzn2023.${package_version}.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-21-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-21-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_25-headful/Dockerfile b/amazoncorretto_25-headful/Dockerfile
index 589c607..a9d7de5 100644
--- a/amazoncorretto_25-headful/Dockerfile
+++ b/amazoncorretto_25-headful/Dockerfile
@@ -4,18 +4,19 @@ ARG version=25.0.2.10-1
 ARG package_version=1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-25-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-25-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-25-amazon-corretto-headless-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-25-amazon-corretto-$version.amzn2023.${package_version}.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-25-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-25-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_25-headless/Dockerfile b/amazoncorretto_25-headless/Dockerfile
index 2354c5d..2ee776e 100644
--- a/amazoncorretto_25-headless/Dockerfile
+++ b/amazoncorretto_25-headless/Dockerfile
@@ -4,18 +4,19 @@ ARG version=25.0.2.10-1
 ARG package_version=1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-25-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-25-amazon-corretto-headless-$version.amzn2023.${package_version}.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-25-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-25-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_25.0.2/Dockerfile b/amazoncorretto_25.0.2/Dockerfile
index cccd509..2a21d6b 100644
--- a/amazoncorretto_25.0.2/Dockerfile
+++ b/amazoncorretto_25.0.2/Dockerfile
@@ -4,18 +4,19 @@ ARG version=25.0.2.10-1
 ARG package_version=1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-25-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-25-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-25-amazon-corretto-devel-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-25-amazon-corretto-jmods-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-25-amazon-corretto-headless-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-25-amazon-corretto-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-25-amazon-corretto-devel-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-25-amazon-corretto-jmods-$version.amzn2023.${package_version}.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-25-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-25-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_26-headful/Dockerfile b/amazoncorretto_26-headful/Dockerfile
index 3f8ae1e..a069faf 100644
--- a/amazoncorretto_26-headful/Dockerfile
+++ b/amazoncorretto_26-headful/Dockerfile
@@ -4,18 +4,19 @@ ARG version=26.0.0.35-2
 ARG package_version=1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-26-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-26-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-26-amazon-corretto-headless-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-26-amazon-corretto-$version.amzn2023.${package_version}.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-26-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-26-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_26-headless/Dockerfile b/amazoncorretto_26-headless/Dockerfile
index 150ead8..a0d3e78 100644
--- a/amazoncorretto_26-headless/Dockerfile
+++ b/amazoncorretto_26-headless/Dockerfile
@@ -4,18 +4,19 @@ ARG version=26.0.0.35-2
 ARG package_version=1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-26-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-26-amazon-corretto-headless-$version.amzn2023.${package_version}.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-26-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-26-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_26.0.0/Dockerfile b/amazoncorretto_26.0.0/Dockerfile
index 9f109a4..ed81886 100644
--- a/amazoncorretto_26.0.0/Dockerfile
+++ b/amazoncorretto_26.0.0/Dockerfile
@@ -4,18 +4,19 @@ ARG version=26.0.0.35-2
 ARG package_version=1
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-26-amazon-corretto-headless-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-26-amazon-corretto-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-26-amazon-corretto-devel-$version.amzn2023.${package_version}.$(uname -m).rpm" "java-26-amazon-corretto-jmods-$version.amzn2023.${package_version}.$(uname -m).rpm") \
+    && RPM_LIST=("java-26-amazon-corretto-headless-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-26-amazon-corretto-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-26-amazon-corretto-devel-$version.amzn2023.${package_version}.${ARCH}.rpm" "java-26-amazon-corretto-jmods-$version.amzn2023.${package_version}.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/$(echo $version | tr '-' '.')/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-26-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-26-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && sed -i '/localpkg_gpgcheck=1/d' /etc/dnf/dnf.conf
diff --git a/amazoncorretto_8u482-al2-native-jdk/Dockerfile b/amazoncorretto_8u482-al2-native-jdk/Dockerfile
index 92aedb4..c56ea84 100644
--- a/amazoncorretto_8u482-al2-native-jdk/Dockerfile
+++ b/amazoncorretto_8u482-al2-native-jdk/Dockerfile
@@ -4,12 +4,13 @@ ARG version=1.8.0_482.b08-1
 
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && export resouce_version=$(echo $version | tr '-' '.' | tr '_' '.'| tr -d "b" | awk -F. '{print $2"."$4"."$5"."$6}') \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2 \
     && echo "localpkg_gpgcheck=1" >> /etc/yum.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-1.8.0-amazon-corretto-$version.amzn2.$(uname -m).rpm" "java-1.8.0-amazon-corretto-devel-$version.amzn2.$(uname -m).rpm") \
+    && RPM_LIST=("java-1.8.0-amazon-corretto-$version.amzn2.${ARCH}.rpm" "java-1.8.0-amazon-corretto-devel-$version.amzn2.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/${resouce_version}/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: rsa sha1 (md5) pgp md5 OK" || exit 1 \
@@ -17,7 +18,7 @@ RUN set -eux \
     done \
     && rpm -i --nodeps ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && (find /usr/lib/jvm/java-1.8.0-amazon-corretto.$(uname -m) -name "*src.zip" -delete || true) \
+    && (find /usr/lib/jvm/java-1.8.0-amazon-corretto.${ARCH} -name "*src.zip" -delete || true) \
     && rm -rf ${CORRETO_TEMP} \
     && yum clean all \
     && rm -rf /var/cache/yum \
diff --git a/amazoncorretto_8u482-al2-native-jre/Dockerfile b/amazoncorretto_8u482-al2-native-jre/Dockerfile
index 0795c1d..b30b93c 100644
--- a/amazoncorretto_8u482-al2-native-jre/Dockerfile
+++ b/amazoncorretto_8u482-al2-native-jre/Dockerfile
@@ -4,12 +4,13 @@ ARG version=1.8.0_482.b08-1
 
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && export resouce_version=$(echo $version | tr '-' '.' | tr '_' '.'| tr -d "b" | awk -F. '{print $2"."$4"."$5"."$6}') \
     && rpm --import /etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2 \
     && echo "localpkg_gpgcheck=1" >> /etc/yum.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-1.8.0-amazon-corretto-$version.amzn2.$(uname -m).rpm") \
+    && RPM_LIST=("java-1.8.0-amazon-corretto-$version.amzn2.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/${resouce_version}/${rpm} \
     && echo $(rpm -K "${CORRETO_TEMP}/${rpm}") \
@@ -18,7 +19,7 @@ RUN set -eux \
     && yum install -y $(yum deplist ${CORRETO_TEMP}/*.rpm |grep provider | grep -v log4j-cve | tr -s ' ' |cut -d ' ' -f 3 ) \
     && rpm -i --nodeps ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-1.8.0-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-1.8.0-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && yum clean all \
     && rm -rf /var/cache/yum \
diff --git a/amazoncorretto_8u482-al2023-jre/Dockerfile b/amazoncorretto_8u482-al2023-jre/Dockerfile
index 5acf4ad..6b277c7 100644
--- a/amazoncorretto_8u482-al2023-jre/Dockerfile
+++ b/amazoncorretto_8u482-al2023-jre/Dockerfile
@@ -4,19 +4,20 @@ ARG version=1.8.0_482.b08-1
 
 
 RUN set -eux \
+    && ARCH="$(rpm --query --queryformat='%{ARCH}' rpm)" \
     && export resouce_version=$(echo $version | tr '-' '.' | tr '_' '.'| tr -d "b" | awk -F. '{print $2"."$4"."$5"."$6}') \
     && rpm --import file:///etc/pki/rpm-gpg/RPM-GPG-KEY-amazon-linux-2023 \
     && echo "localpkg_gpgcheck=1" >> /etc/dnf/dnf.conf \
     && CORRETO_TEMP=$(mktemp -d) \
     && pushd ${CORRETO_TEMP} \
-    && RPM_LIST=("java-1.8.0-amazon-corretto-$version.amzn2023.$(uname -m).rpm" "java-1.8.0-amazon-corretto-devel-$version.amzn2023.$(uname -m).rpm") \
+    && RPM_LIST=("java-1.8.0-amazon-corretto-$version.amzn2023.${ARCH}.rpm" "java-1.8.0-amazon-corretto-devel-$version.amzn2023.${ARCH}.rpm") \
     && for rpm in ${RPM_LIST[@]}; do \
     curl --fail -O https://corretto.aws/downloads/resources/${resouce_version}/${rpm} \
     && rpm -K "${CORRETO_TEMP}/${rpm}" | grep -F "${CORRETO_TEMP}/${rpm}: digests signatures OK" || exit 1; \
     done \
     && dnf install -y ${CORRETO_TEMP}/*.rpm \
     && popd \
-    && rm -rf /usr/lib/jvm/java-1.8.0-amazon-corretto.$(uname -m)/lib/src.zip \
+    && rm -rf /usr/lib/jvm/java-1.8.0-amazon-corretto.${ARCH}/lib/src.zip \
     && rm -rf ${CORRETO_TEMP} \
     && dnf clean all \
     && rm -rf /var/cache/yum \

Relevant Maintainers:

amazoncorretto: @corretto @lutkerd @benty-amzn @alvdavi @rgithubli @mrserb @Rudometov @elifaslan1 @chadrako @ianrichr @synecdoche @cost0much @midver @mmm-choi @satyenme

cost0much · 2026-04-03T16:19:02Z

@mmm-choi There's a failing check? Might need a look at. Also, I'm not sure this update is wholly necessary? Q2 release is right around the corner, and we can simply include this change as part of that release. Don't think this meaningfully changes the docker images.

mmm-choi · 2026-04-03T16:24:57Z

The error looks unrelated to our change:

Error: /home/runner/go/pkg/mod/github.com/containerd/containerd@v1.6.19/archive/compression/compression.go:32:2: github.com/klauspost/compress@v1.18.0: Get "https://storage.googleapis.com/proxy-golang-org-prod/58b3681212b4978c-github.com:klauspost:compress-v1.18.0.zip?Expires=1775314266&GoogleAccessId=gcs-urlsigner-prod%40golang-modproxy.iam.gserviceaccount.com&Signature=lfTO7TPU%2BVBw5RM0vH67TUfL%2B1VNw41s2QZp%2FNG0MS2%2BBk0bt6ZtLAn0HncMbrYTdMViF%2F6O4V7H2S3ha3OWDceG2XVRZeoW%2FxbkI%2FCWZhONVuLmIokGDS12XYfMfOa8hV1SZdmSsIYBb7G1%2B7OicyxFvrNl0IT47plYrA1U7kB9TXj3mEhoVoGmSr61NQMXGZA7UyzOFx%2Frsf109Is8%2FvymNB9JmXJRMGqUORCPOv0uqkWFmZv02dIrUd%2BXqFn%2B8UTtrUBF96KHhqbiopRfUrdHhZLv6qs9UNbxIdedsTdvQUH3COPyj%2FzKbPRhIDRo%2FNeBctYSSLA6GIgWtSlX%2Bg%3D%3D": 
net/http: TLS handshake timeout

We've updated just the GitCommit hash before https://github.com/docker-library/official-images/pull/20752/changes

tianon

Yeah CI failure was just a flaky infra glitch 👍

FWIW, smaller changes like this make it easier for us to review (and make the version bumps smoother too, because then we're only reviewing the version bump itself) 👀

Thank you for updating this! ❤️

Update amazoncorretto GitCommit for uname-to-rpm-query change

2dd150b

Update GitCommit to point to corretto/corretto-docker commit that replaces uname -m with rpm --query for userspace architecture detection in AL2/AL2023 Dockerfiles.

mmm-choi requested a review from a team as a code owner April 3, 2026 16:05

github-actions bot added the library/amazoncorretto label Apr 3, 2026

tianon approved these changes Apr 3, 2026

View reviewed changes

tianon merged commit 108cf41 into docker-library:master Apr 3, 2026
116 of 117 checks passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update amazoncorretto: replace uname -m with rpm --query#21168

Update amazoncorretto: replace uname -m with rpm --query#21168
tianon merged 1 commit intodocker-library:masterfrom
mmm-choi:update-amazoncorretto

mmm-choi commented Apr 3, 2026

Uh oh!

github-actions bot commented Apr 3, 2026

Uh oh!

cost0much commented Apr 3, 2026

Uh oh!

mmm-choi commented Apr 3, 2026

Uh oh!

tianon left a comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

mmm-choi commented Apr 3, 2026

Summary

Uh oh!

github-actions bot commented Apr 3, 2026

Uh oh!

cost0much commented Apr 3, 2026

Uh oh!

mmm-choi commented Apr 3, 2026

Uh oh!

tianon left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants