chore: update corretto.key sha

fixes #527
carlossg · Jan 25, 2025 · cffa656 · cffa656
1 parent d464682
commit cffa656
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 8 deletions.
diff --git a/amazoncorretto-11-debian/Dockerfile b/amazoncorretto-11-debian/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update \
   && apt-get install -y curl gnupg openssh-client \
   && export GNUPGHOME="$(mktemp -d)" \
   && curl -fL https://apt.corretto.aws/corretto.key -o corretto.key \
-  && echo '18bbe2461ff5acb1212f95f3e41034c503460532de21c24f5f935359b2303586 *corretto.key' | sha256sum -c - \
+  && echo '5fdaed0a262b975776b1d5c0170d2e86b1be1e98b27ef97114b04ec9ac7f011d *corretto.key' | sha256sum -c - \
   && gpg --batch --import corretto.key \
   && rm corretto.key \
   && gpg --batch --export '6DC3636DAE534049C8B94623A122542AB04F24E3' > /usr/share/keyrings/corretto.gpg \

diff --git a/amazoncorretto-17-debian-maven-4/Dockerfile b/amazoncorretto-17-debian-maven-4/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update \
   && apt-get install -y curl gnupg openssh-client \
   && export GNUPGHOME="$(mktemp -d)" \
   && curl -fL https://apt.corretto.aws/corretto.key -o corretto.key \
-  && echo '18bbe2461ff5acb1212f95f3e41034c503460532de21c24f5f935359b2303586 *corretto.key' | sha256sum -c - \
+  && echo '5fdaed0a262b975776b1d5c0170d2e86b1be1e98b27ef97114b04ec9ac7f011d *corretto.key' | sha256sum -c - \
   && gpg --batch --import corretto.key \
   && rm corretto.key \
   && gpg --batch --export '6DC3636DAE534049C8B94623A122542AB04F24E3' > /usr/share/keyrings/corretto.gpg \

diff --git a/amazoncorretto-17-debian/Dockerfile b/amazoncorretto-17-debian/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update \
   && apt-get install -y curl gnupg openssh-client \
   && export GNUPGHOME="$(mktemp -d)" \
   && curl -fL https://apt.corretto.aws/corretto.key -o corretto.key \
-  && echo '18bbe2461ff5acb1212f95f3e41034c503460532de21c24f5f935359b2303586 *corretto.key' | sha256sum -c - \
+  && echo '5fdaed0a262b975776b1d5c0170d2e86b1be1e98b27ef97114b04ec9ac7f011d *corretto.key' | sha256sum -c - \
   && gpg --batch --import corretto.key \
   && rm corretto.key \
   && gpg --batch --export '6DC3636DAE534049C8B94623A122542AB04F24E3' > /usr/share/keyrings/corretto.gpg \

diff --git a/amazoncorretto-21-debian-maven-4/Dockerfile b/amazoncorretto-21-debian-maven-4/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update \
   && apt-get install -y curl gnupg openssh-client \
   && export GNUPGHOME="$(mktemp -d)" \
   && curl -fL https://apt.corretto.aws/corretto.key -o corretto.key \
-  && echo '18bbe2461ff5acb1212f95f3e41034c503460532de21c24f5f935359b2303586 *corretto.key' | sha256sum -c - \
+  && echo '5fdaed0a262b975776b1d5c0170d2e86b1be1e98b27ef97114b04ec9ac7f011d *corretto.key' | sha256sum -c - \
   && gpg --batch --import corretto.key \
   && rm corretto.key \
   && gpg --batch --export '6DC3636DAE534049C8B94623A122542AB04F24E3' > /usr/share/keyrings/corretto.gpg \

diff --git a/amazoncorretto-21-debian/Dockerfile b/amazoncorretto-21-debian/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update \
   && apt-get install -y curl gnupg openssh-client \
   && export GNUPGHOME="$(mktemp -d)" \
   && curl -fL https://apt.corretto.aws/corretto.key -o corretto.key \
-  && echo '18bbe2461ff5acb1212f95f3e41034c503460532de21c24f5f935359b2303586 *corretto.key' | sha256sum -c - \
+  && echo '5fdaed0a262b975776b1d5c0170d2e86b1be1e98b27ef97114b04ec9ac7f011d *corretto.key' | sha256sum -c - \
   && gpg --batch --import corretto.key \
   && rm corretto.key \
   && gpg --batch --export '6DC3636DAE534049C8B94623A122542AB04F24E3' > /usr/share/keyrings/corretto.gpg \

diff --git a/amazoncorretto-23-debian-maven-4/Dockerfile b/amazoncorretto-23-debian-maven-4/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update \
   && apt-get install -y curl gnupg openssh-client \
   && export GNUPGHOME="$(mktemp -d)" \
   && curl -fL https://apt.corretto.aws/corretto.key -o corretto.key \
-  && echo '18bbe2461ff5acb1212f95f3e41034c503460532de21c24f5f935359b2303586 *corretto.key' | sha256sum -c - \
+  && echo '5fdaed0a262b975776b1d5c0170d2e86b1be1e98b27ef97114b04ec9ac7f011d *corretto.key' | sha256sum -c - \
   && gpg --batch --import corretto.key \
   && rm corretto.key \
   && gpg --batch --export '6DC3636DAE534049C8B94623A122542AB04F24E3' > /usr/share/keyrings/corretto.gpg \

diff --git a/amazoncorretto-23-debian/Dockerfile b/amazoncorretto-23-debian/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update \
   && apt-get install -y curl gnupg openssh-client \
   && export GNUPGHOME="$(mktemp -d)" \
   && curl -fL https://apt.corretto.aws/corretto.key -o corretto.key \
-  && echo '18bbe2461ff5acb1212f95f3e41034c503460532de21c24f5f935359b2303586 *corretto.key' | sha256sum -c - \
+  && echo '5fdaed0a262b975776b1d5c0170d2e86b1be1e98b27ef97114b04ec9ac7f011d *corretto.key' | sha256sum -c - \
   && gpg --batch --import corretto.key \
   && rm corretto.key \
   && gpg --batch --export '6DC3636DAE534049C8B94623A122542AB04F24E3' > /usr/share/keyrings/corretto.gpg \

diff --git a/amazoncorretto-8-debian/Dockerfile b/amazoncorretto-8-debian/Dockerfile
@@ -8,7 +8,7 @@ RUN apt-get update \
   && apt-get install -y curl gnupg openssh-client \
   && export GNUPGHOME="$(mktemp -d)" \
   && curl -fL https://apt.corretto.aws/corretto.key -o corretto.key \
-  && echo '18bbe2461ff5acb1212f95f3e41034c503460532de21c24f5f935359b2303586 *corretto.key' | sha256sum -c - \
+  && echo '5fdaed0a262b975776b1d5c0170d2e86b1be1e98b27ef97114b04ec9ac7f011d *corretto.key' | sha256sum -c - \
   && gpg --batch --import corretto.key \
   && rm corretto.key \
   && gpg --batch --export '6DC3636DAE534049C8B94623A122542AB04F24E3' > /usr/share/keyrings/corretto.gpg \

diff --git a/publish.sh b/publish.sh
@@ -65,6 +65,12 @@ find . -iname Dockerfile -exec grep -Hl "ARG uri=" {} \; | while read -r file; d
 	sed -i -e "s#JAVA_HOME=C.*#JAVA_HOME=C:/ProgramData/${java_home}#" "$file"
 done
 
+# Replace corretto.key sha
+new_sha=$(curl -sSfL https://apt.corretto.aws/corretto.key | sha256)
+find . -maxdepth 2 -name Dockerfile -exec \
+	sed -i "s/echo '[0-9a-f]* \*corretto.key' | sha256sum/echo '${new_sha} \*corretto.key' | sha256sum/g" {} \+
+echo "Replaced corretto.key SHA in all files."
+
 echo "Generating stackbrew"
 ./generate-stackbrew-library.sh >"${OFFICIAL_IMAGES_DIR}/library/maven"