From 0cb25a05ebfe725244370f0468190379cd998948 Mon Sep 17 00:00:00 2001
From: Rui Li <ruiamzn@amazon.com>
Date: Wed, 2 Aug 2023 14:29:16 -0700
Subject: [PATCH] Bugfix: Move al2023 generic version updates out

---
 bin/update-dockerfiles.sh | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/bin/update-dockerfiles.sh b/bin/update-dockerfiles.sh
index 159853a..bfe9380 100755
--- a/bin/update-dockerfiles.sh
+++ b/bin/update-dockerfiles.sh
@@ -53,7 +53,6 @@ update_generic_linux() {
     jdk_build=$(echo ${CORRETTO_VERSION} | cut -d'.' -f4)
     corretto_version=$(echo ${CORRETTO_VERSION} | cut -d'.' -f5)
     ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2-generic/Dockerfile
-    ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2023-generic/Dockerfile
 
     if [[ "${LTS_VERSIONS[*]}" =~ ${MAJOR_RELEASE} ]]; then
         ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2023/Dockerfile
@@ -83,6 +82,17 @@ update_generic_linux() {
     fi
 }
 
+update_al2023_generic_linux() {
+    CORRETTO_VERSION=$1
+    MAJOR_RELEASE=$2
+
+    jdk_version=$(echo ${CORRETTO_VERSION} | cut -d'.' -f1-3)
+    jdk_build=$(echo ${CORRETTO_VERSION} | cut -d'.' -f4)
+    corretto_version=$(echo ${CORRETTO_VERSION} | cut -d'.' -f5)
+
+    ${SED} "s/ARG version=.*/ARG version=${jdk_version}.${jdk_build}-${corretto_version}/g" ./${MAJOR_RELEASE}/jdk/al2023-generic/Dockerfile
+}
+
 while [ "$1" != "" ]; do
     case $1 in
         --help )
@@ -112,6 +122,7 @@ fi
 
 if [ ! -z "${CORRETTO_20_GENERIC_LINUX}" ]; then
     update_generic_linux ${CORRETTO_20_GENERIC_LINUX} 20
+    update_al2023_generic_linux ${CORRETTO_20_GENERIC_LINUX} 20
 fi
 
 if [ ! -z "${CORRETTO_8_GENERIC_LINUX}" ]; then