From 44fd501f4d52ba3720494327dc37e3787d4eba79 Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:05:07 -0400
Subject: [PATCH 1/7] Add PARENT_IMAGE build arg

---
 ga/24.0.0.12/full/Dockerfile.ubuntu.ibmjava8    | 3 ++-
 ga/24.0.0.12/full/Dockerfile.ubuntu.openjdk11   | 3 ++-
 ga/24.0.0.12/full/Dockerfile.ubuntu.openjdk17   | 3 ++-
 ga/24.0.0.12/kernel/Dockerfile.ubi.ibmjava8     | 5 +++--
 ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk11    | 5 +++--
 ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk17    | 5 +++--
 ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk21    | 5 +++--
 ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk8     | 5 +++--
 ga/24.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8  | 3 ++-
 ga/24.0.0.12/kernel/Dockerfile.ubuntu.openjdk11 | 3 ++-
 ga/24.0.0.12/kernel/Dockerfile.ubuntu.openjdk17 | 3 ++-
 ga/24.0.0.12/oidcProvider/Dockerfile            | 3 ++-
 ga/24.0.0.12/oidcProvider/Dockerfile.java11     | 3 ++-
 ga/24.0.0.9/full/Dockerfile.ubuntu.ibmjava8     | 3 ++-
 ga/24.0.0.9/full/Dockerfile.ubuntu.openjdk11    | 3 ++-
 ga/24.0.0.9/full/Dockerfile.ubuntu.openjdk17    | 3 ++-
 ga/24.0.0.9/kernel/Dockerfile.ubi.ibmjava8      | 5 +++--
 ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk11     | 5 +++--
 ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk17     | 5 +++--
 ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk21     | 5 +++--
 ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk8      | 5 +++--
 ga/24.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8   | 3 ++-
 ga/24.0.0.9/kernel/Dockerfile.ubuntu.openjdk11  | 3 ++-
 ga/24.0.0.9/kernel/Dockerfile.ubuntu.openjdk17  | 3 ++-
 ga/24.0.0.9/oidcProvider/Dockerfile             | 3 ++-
 ga/24.0.0.9/oidcProvider/Dockerfile.java11      | 3 ++-
 ga/latest/full/Dockerfile.ubuntu.ibmjava8       | 3 ++-
 ga/latest/full/Dockerfile.ubuntu.openjdk11      | 3 ++-
 ga/latest/full/Dockerfile.ubuntu.openjdk17      | 3 ++-
 ga/latest/kernel/Dockerfile.ubi.ibmjava8        | 5 +++--
 ga/latest/kernel/Dockerfile.ubi.openjdk11       | 5 +++--
 ga/latest/kernel/Dockerfile.ubi.openjdk17       | 5 +++--
 ga/latest/kernel/Dockerfile.ubi.openjdk21       | 5 +++--
 ga/latest/kernel/Dockerfile.ubi.openjdk8        | 5 +++--
 ga/latest/kernel/Dockerfile.ubuntu.ibmjava8     | 3 ++-
 ga/latest/kernel/Dockerfile.ubuntu.openjdk11    | 3 ++-
 ga/latest/kernel/Dockerfile.ubuntu.openjdk17    | 3 ++-
 ga/latest/oidcProvider/Dockerfile               | 3 ++-
 ga/latest/oidcProvider/Dockerfile.java11        | 3 ++-
 ga/production-upgrade/Dockerfile                | 3 ++-
 samples/security/Dockerfile                     | 3 ++-
 41 files changed, 97 insertions(+), 56 deletions(-)

diff --git a/ga/24.0.0.12/full/Dockerfile.ubuntu.ibmjava8 b/ga/24.0.0.12/full/Dockerfile.ubuntu.ibmjava8
index c02b69ad1..8e4cf2672 100644
--- a/ga/24.0.0.12/full/Dockerfile.ubuntu.ibmjava8
+++ b/ga/24.0.0.12/full/Dockerfile.ubuntu.ibmjava8
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:24.0.0.12-kernel-java8-ibmjava
+ARG PARENT_IMAGE=websphere-liberty:24.0.0.12-kernel-java8-ibmjava
+FROM $PARENT_IMAGE
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/ga/24.0.0.12/full/Dockerfile.ubuntu.openjdk11 b/ga/24.0.0.12/full/Dockerfile.ubuntu.openjdk11
index ea33dd203..48427442a 100644
--- a/ga/24.0.0.12/full/Dockerfile.ubuntu.openjdk11
+++ b/ga/24.0.0.12/full/Dockerfile.ubuntu.openjdk11
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:24.0.0.12-kernel-java11-openj9
+ARG PARENT_IMAGE=websphere-liberty:24.0.0.12-kernel-java11-openj9
+FROM $PARENT_IMAGE
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/ga/24.0.0.12/full/Dockerfile.ubuntu.openjdk17 b/ga/24.0.0.12/full/Dockerfile.ubuntu.openjdk17
index b84d31a2c..790c459c5 100644
--- a/ga/24.0.0.12/full/Dockerfile.ubuntu.openjdk17
+++ b/ga/24.0.0.12/full/Dockerfile.ubuntu.openjdk17
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:24.0.0.12-kernel-java17-openj9
+ARG PARENT_IMAGE=websphere-liberty:24.0.0.12-kernel-java17-openj9
+FROM $PARENT_IMAGE
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/ga/24.0.0.12/kernel/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.12/kernel/Dockerfile.ubi.ibmjava8
index 3449a1e1c..aeb0bc2de 100644
--- a/ga/24.0.0.12/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/24.0.0.12/kernel/Dockerfile.ubi.ibmjava8
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibmjava:8-ubi AS getRuntime
+ARG PARENT_IMAGE=ibmjava:8-ubi
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -41,7 +42,7 @@ RUN yum -y install unzip wget openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM ibmjava:8-ubi
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk11 b/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk11
index bb636d3f3..fad406a53 100644
--- a/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk11
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi AS getRuntime
+ARG PARENT_IMAGE=icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -42,7 +43,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk17 b/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk17
index 03df712af..d90c97cbf 100644
--- a/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk17
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi AS getRuntime
+ARG PARENT_IMAGE=icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -41,7 +42,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk21 b/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk21
index 19c7ff902..8ad8aebb5 100644
--- a/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk21
+++ b/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk21
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal AS getRuntime
+ARG PARENT_IMAGE=icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -40,7 +41,7 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk8 b/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk8
index 16dcbeb21..1dde436b0 100644
--- a/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/24.0.0.12/kernel/Dockerfile.ubi.openjdk8
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi AS getRuntime
+ARG PARENT_IMAGE=icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -41,7 +42,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/24.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8
index 82618d324..4dbc6f892 100644
--- a/ga/24.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/24.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibmjava:8-jre
+ARG PARENT_IMAGE=ibmjava:8-jre
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.12/kernel/Dockerfile.ubuntu.openjdk11 b/ga/24.0.0.12/kernel/Dockerfile.ubuntu.openjdk11
index 9e32932d8..e85b01c31 100644
--- a/ga/24.0.0.12/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/24.0.0.12/kernel/Dockerfile.ubuntu.openjdk11
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-11-jre-jammy
+ARG PARENT_IMAGE=ibm-semeru-runtimes:open-11-jre-jammy
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.12/kernel/Dockerfile.ubuntu.openjdk17 b/ga/24.0.0.12/kernel/Dockerfile.ubuntu.openjdk17
index 2b10425f1..4c8b1b891 100644
--- a/ga/24.0.0.12/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/24.0.0.12/kernel/Dockerfile.ubuntu.openjdk17
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-17-jre-jammy
+ARG PARENT_IMAGE=ibm-semeru-runtimes:open-17-jre-jammy
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.12/oidcProvider/Dockerfile b/ga/24.0.0.12/oidcProvider/Dockerfile
index b98aa0de5..cbd827acc 100644
--- a/ga/24.0.0.12/oidcProvider/Dockerfile
+++ b/ga/24.0.0.12/oidcProvider/Dockerfile
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:kernel
+ARG PARENT_IMAGE=websphere-liberty:kernel
+FROM $PARENT_IMAGE
 
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/ga/24.0.0.12/oidcProvider/Dockerfile.java11 b/ga/24.0.0.12/oidcProvider/Dockerfile.java11
index e722d7d7f..0b5d7c76b 100644
--- a/ga/24.0.0.12/oidcProvider/Dockerfile.java11
+++ b/ga/24.0.0.12/oidcProvider/Dockerfile.java11
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:kernel-java11
+ARG PARENT_IMAGE=websphere-liberty:kernel-java11
+FROM $PARENT_IMAGE
 
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/ga/24.0.0.9/full/Dockerfile.ubuntu.ibmjava8 b/ga/24.0.0.9/full/Dockerfile.ubuntu.ibmjava8
index f9004b4f4..de8bb8b7a 100644
--- a/ga/24.0.0.9/full/Dockerfile.ubuntu.ibmjava8
+++ b/ga/24.0.0.9/full/Dockerfile.ubuntu.ibmjava8
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:24.0.0.9-kernel-java8-ibmjava
+ARG PARENT_IMAGE=websphere-liberty:24.0.0.9-kernel-java8-ibmjava
+FROM $PARENT_IMAGE
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/ga/24.0.0.9/full/Dockerfile.ubuntu.openjdk11 b/ga/24.0.0.9/full/Dockerfile.ubuntu.openjdk11
index f03c3a149..47e37cae4 100644
--- a/ga/24.0.0.9/full/Dockerfile.ubuntu.openjdk11
+++ b/ga/24.0.0.9/full/Dockerfile.ubuntu.openjdk11
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:24.0.0.9-kernel-java11-openj9
+ARG PARENT_IMAGE=websphere-liberty:24.0.0.9-kernel-java11-openj9
+FROM $PARENT_IMAGE
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/ga/24.0.0.9/full/Dockerfile.ubuntu.openjdk17 b/ga/24.0.0.9/full/Dockerfile.ubuntu.openjdk17
index e36b8b222..684a056b2 100644
--- a/ga/24.0.0.9/full/Dockerfile.ubuntu.openjdk17
+++ b/ga/24.0.0.9/full/Dockerfile.ubuntu.openjdk17
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:24.0.0.9-kernel-java17-openj9
+ARG PARENT_IMAGE=websphere-liberty:24.0.0.9-kernel-java17-openj9
+FROM $PARENT_IMAGE
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/ga/24.0.0.9/kernel/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.9/kernel/Dockerfile.ubi.ibmjava8
index 41b34910f..318ea4ec8 100644
--- a/ga/24.0.0.9/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/24.0.0.9/kernel/Dockerfile.ubi.ibmjava8
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibmjava:8-ubi AS getRuntime
+ARG PARENT_IMAGE=ibmjava:8-ubi
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -41,7 +42,7 @@ RUN yum -y install unzip wget openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM ibmjava:8-ubi
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk11 b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk11
index 5715e08c1..b2c4bc98a 100644
--- a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk11
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi AS getRuntime
+ARG PARENT_IMAGE=icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -42,7 +43,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk17 b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk17
index cb9be8674..ca4230ac6 100644
--- a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk17
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi AS getRuntime
+ARG PARENT_IMAGE=icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -41,7 +42,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk21 b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk21
index 293bee43c..f381bfbba 100644
--- a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk21
+++ b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk21
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal AS getRuntime
+ARG PARENT_IMAGE=icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -40,7 +41,7 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk8 b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk8
index 29ecf2f9a..f8ba743c8 100644
--- a/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/24.0.0.9/kernel/Dockerfile.ubi.openjdk8
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi AS getRuntime
+ARG PARENT_IMAGE=icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -41,7 +42,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/24.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8
index 40f987133..0a4e51392 100644
--- a/ga/24.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/24.0.0.9/kernel/Dockerfile.ubuntu.ibmjava8
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibmjava:8-jre
+ARG PARENT_IMAGE=ibmjava:8-jre
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.9/kernel/Dockerfile.ubuntu.openjdk11 b/ga/24.0.0.9/kernel/Dockerfile.ubuntu.openjdk11
index 9560059de..be5311f31 100644
--- a/ga/24.0.0.9/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/24.0.0.9/kernel/Dockerfile.ubuntu.openjdk11
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-11-jre-jammy
+ARG PARENT_IMAGE=ibm-semeru-runtimes:open-11-jre-jammy
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.9/kernel/Dockerfile.ubuntu.openjdk17 b/ga/24.0.0.9/kernel/Dockerfile.ubuntu.openjdk17
index c0267ffd3..4bd77774a 100644
--- a/ga/24.0.0.9/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/24.0.0.9/kernel/Dockerfile.ubuntu.openjdk17
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-17-jre-jammy
+ARG PARENT_IMAGE=ibm-semeru-runtimes:open-17-jre-jammy
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/24.0.0.9/oidcProvider/Dockerfile b/ga/24.0.0.9/oidcProvider/Dockerfile
index b98aa0de5..cbd827acc 100644
--- a/ga/24.0.0.9/oidcProvider/Dockerfile
+++ b/ga/24.0.0.9/oidcProvider/Dockerfile
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:kernel
+ARG PARENT_IMAGE=websphere-liberty:kernel
+FROM $PARENT_IMAGE
 
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/ga/24.0.0.9/oidcProvider/Dockerfile.java11 b/ga/24.0.0.9/oidcProvider/Dockerfile.java11
index e722d7d7f..0b5d7c76b 100644
--- a/ga/24.0.0.9/oidcProvider/Dockerfile.java11
+++ b/ga/24.0.0.9/oidcProvider/Dockerfile.java11
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:kernel-java11
+ARG PARENT_IMAGE=websphere-liberty:kernel-java11
+FROM $PARENT_IMAGE
 
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/ga/latest/full/Dockerfile.ubuntu.ibmjava8 b/ga/latest/full/Dockerfile.ubuntu.ibmjava8
index c301dfec2..3a0ee78bb 100644
--- a/ga/latest/full/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/full/Dockerfile.ubuntu.ibmjava8
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:kernel-java8-ibmjava
+ARG PARENT_IMAGE=websphere-liberty:kernel-java8-ibmjava
+FROM $PARENT_IMAGE
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/ga/latest/full/Dockerfile.ubuntu.openjdk11 b/ga/latest/full/Dockerfile.ubuntu.openjdk11
index 305136390..243de21e4 100644
--- a/ga/latest/full/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/full/Dockerfile.ubuntu.openjdk11
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:kernel-java11-openj9
+ARG PARENT_IMAGE=websphere-liberty:kernel-java11-openj9
+FROM $PARENT_IMAGE
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/ga/latest/full/Dockerfile.ubuntu.openjdk17 b/ga/latest/full/Dockerfile.ubuntu.openjdk17
index 58d75c5a0..804bd2f79 100644
--- a/ga/latest/full/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/full/Dockerfile.ubuntu.openjdk17
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:kernel-java17-openj9
+ARG PARENT_IMAGE=websphere-liberty:kernel-java17-openj9
+FROM $PARENT_IMAGE
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""
diff --git a/ga/latest/kernel/Dockerfile.ubi.ibmjava8 b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
index 3449a1e1c..aeb0bc2de 100644
--- a/ga/latest/kernel/Dockerfile.ubi.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubi.ibmjava8
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibmjava:8-ubi AS getRuntime
+ARG PARENT_IMAGE=ibmjava:8-ubi
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -41,7 +42,7 @@ RUN yum -y install unzip wget openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM ibmjava:8-ubi
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk11 b/ga/latest/kernel/Dockerfile.ubi.openjdk11
index bb636d3f3..fad406a53 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk11
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi AS getRuntime
+ARG PARENT_IMAGE=icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -42,7 +43,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17
index 03df712af..d90c97cbf 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk17
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi AS getRuntime
+ARG PARENT_IMAGE=icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -41,7 +42,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk21 b/ga/latest/kernel/Dockerfile.ubi.openjdk21
index 19c7ff902..8ad8aebb5 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk21
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk21
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal AS getRuntime
+ARG PARENT_IMAGE=icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -40,7 +41,7 @@ RUN microdnf -y install shadow-utils unzip wget findutils openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8
index 16dcbeb21..1dde436b0 100644
--- a/ga/latest/kernel/Dockerfile.ubi.openjdk8
+++ b/ga/latest/kernel/Dockerfile.ubi.openjdk8
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi AS getRuntime
+ARG PARENT_IMAGE=icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi
+FROM $PARENT_IMAGE AS getRuntime
 
 USER root
 
@@ -41,7 +42,7 @@ RUN yum -y install shadow-utils unzip wget findutils openssl \
     && chmod -R g+rw /opt/ibm/wlp \
     && cp -a /opt/ibm/wlp/lafiles/. /licenses/
 
-FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
index 82618d324..4dbc6f892 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
+++ b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibmjava:8-jre
+ARG PARENT_IMAGE=ibmjava:8-jre
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
index 9e32932d8..e85b01c31 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-11-jre-jammy
+ARG PARENT_IMAGE=ibm-semeru-runtimes:open-11-jre-jammy
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
index 2b10425f1..4c8b1b891 100644
--- a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
+++ b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibm-semeru-runtimes:open-17-jre-jammy
+ARG PARENT_IMAGE=ibm-semeru-runtimes:open-17-jre-jammy
+FROM $PARENT_IMAGE
 
 USER root
 
diff --git a/ga/latest/oidcProvider/Dockerfile b/ga/latest/oidcProvider/Dockerfile
index b98aa0de5..cbd827acc 100644
--- a/ga/latest/oidcProvider/Dockerfile
+++ b/ga/latest/oidcProvider/Dockerfile
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:kernel
+ARG PARENT_IMAGE=websphere-liberty:kernel
+FROM $PARENT_IMAGE
 
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/ga/latest/oidcProvider/Dockerfile.java11 b/ga/latest/oidcProvider/Dockerfile.java11
index e722d7d7f..0b5d7c76b 100644
--- a/ga/latest/oidcProvider/Dockerfile.java11
+++ b/ga/latest/oidcProvider/Dockerfile.java11
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty:kernel-java11
+ARG PARENT_IMAGE=websphere-liberty:kernel-java11
+FROM $PARENT_IMAGE
 
 ARG REPOSITORIES_PROPERTIES=""
 
diff --git a/ga/production-upgrade/Dockerfile b/ga/production-upgrade/Dockerfile
index 5cbffaa14..b1209fe4c 100644
--- a/ga/production-upgrade/Dockerfile
+++ b/ga/production-upgrade/Dockerfile
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM websphere-liberty
+ARG PARENT_IMAGE=websphere-liberty
+FROM $PARENT_IMAGE
 COPY wlp-*-license.jar /tmp/
 RUN java -jar /tmp/wlp-*-license.jar --acceptLicense /opt/ibm \
     && rm /tmp/wlp-*-license.jar
diff --git a/samples/security/Dockerfile b/samples/security/Dockerfile
index 2d39dfd12..041ccc588 100644
--- a/samples/security/Dockerfile
+++ b/samples/security/Dockerfile
@@ -1,4 +1,5 @@
-FROM ibmcom/websphere-liberty:kernel-java8-openj9-ubi
+ARG PARENT_IMAGE=ibmcom/websphere-liberty:kernel-java8-openj9-ubi
+FROM $PARENT_IMAGE
 
 # Add my app and config
 COPY --chown=1001:0  server.xml /config/

From a25e9b5bcb69940d7d4025033d8a663c80d6d0ff Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:05:40 -0400
Subject: [PATCH 2/7] Remove extra PARENT_IMAGE ref in full UBI images

---
 ga/24.0.0.12/full/Dockerfile.ubi.ibmjava8  | 1 -
 ga/24.0.0.12/full/Dockerfile.ubi.openjdk11 | 1 -
 ga/24.0.0.12/full/Dockerfile.ubi.openjdk17 | 1 -
 ga/24.0.0.12/full/Dockerfile.ubi.openjdk21 | 1 -
 ga/24.0.0.12/full/Dockerfile.ubi.openjdk8  | 1 -
 ga/24.0.0.9/full/Dockerfile.ubi.ibmjava8   | 1 -
 ga/24.0.0.9/full/Dockerfile.ubi.openjdk11  | 1 -
 ga/24.0.0.9/full/Dockerfile.ubi.openjdk17  | 1 -
 ga/24.0.0.9/full/Dockerfile.ubi.openjdk21  | 1 -
 ga/24.0.0.9/full/Dockerfile.ubi.openjdk8   | 1 -
 ga/latest/full/Dockerfile.ubi.ibmjava8     | 1 -
 ga/latest/full/Dockerfile.ubi.openjdk11    | 1 -
 ga/latest/full/Dockerfile.ubi.openjdk17    | 1 -
 ga/latest/full/Dockerfile.ubi.openjdk21    | 1 -
 ga/latest/full/Dockerfile.ubi.openjdk8     | 1 -
 15 files changed, 15 deletions(-)

diff --git a/ga/24.0.0.12/full/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.12/full/Dockerfile.ubi.ibmjava8
index 64fae7997..cf9bc5731 100644
--- a/ga/24.0.0.12/full/Dockerfile.ubi.ibmjava8
+++ b/ga/24.0.0.12/full/Dockerfile.ubi.ibmjava8
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.12-kernel-java8-ibmjava-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/24.0.0.12/full/Dockerfile.ubi.openjdk11 b/ga/24.0.0.12/full/Dockerfile.ubi.openjdk11
index 5b619deb0..35d312408 100644
--- a/ga/24.0.0.12/full/Dockerfile.ubi.openjdk11
+++ b/ga/24.0.0.12/full/Dockerfile.ubi.openjdk11
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.12-kernel-java11-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/24.0.0.12/full/Dockerfile.ubi.openjdk17 b/ga/24.0.0.12/full/Dockerfile.ubi.openjdk17
index 9b0805fe2..600428688 100644
--- a/ga/24.0.0.12/full/Dockerfile.ubi.openjdk17
+++ b/ga/24.0.0.12/full/Dockerfile.ubi.openjdk17
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.12-kernel-java17-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/24.0.0.12/full/Dockerfile.ubi.openjdk21 b/ga/24.0.0.12/full/Dockerfile.ubi.openjdk21
index 415796e5b..eef7e139e 100644
--- a/ga/24.0.0.12/full/Dockerfile.ubi.openjdk21
+++ b/ga/24.0.0.12/full/Dockerfile.ubi.openjdk21
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.12-kernel-java21-openj9-ubi9-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/24.0.0.12/full/Dockerfile.ubi.openjdk8 b/ga/24.0.0.12/full/Dockerfile.ubi.openjdk8
index 2931a9aa0..caee21c81 100644
--- a/ga/24.0.0.12/full/Dockerfile.ubi.openjdk8
+++ b/ga/24.0.0.12/full/Dockerfile.ubi.openjdk8
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.12-kernel-java8-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/24.0.0.9/full/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.9/full/Dockerfile.ubi.ibmjava8
index c08a9f597..bc569215b 100644
--- a/ga/24.0.0.9/full/Dockerfile.ubi.ibmjava8
+++ b/ga/24.0.0.9/full/Dockerfile.ubi.ibmjava8
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.9-kernel-java8-ibmjava-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/24.0.0.9/full/Dockerfile.ubi.openjdk11 b/ga/24.0.0.9/full/Dockerfile.ubi.openjdk11
index 47761532b..d45a900c8 100644
--- a/ga/24.0.0.9/full/Dockerfile.ubi.openjdk11
+++ b/ga/24.0.0.9/full/Dockerfile.ubi.openjdk11
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.9-kernel-java11-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/24.0.0.9/full/Dockerfile.ubi.openjdk17 b/ga/24.0.0.9/full/Dockerfile.ubi.openjdk17
index aab85e297..693751bf4 100644
--- a/ga/24.0.0.9/full/Dockerfile.ubi.openjdk17
+++ b/ga/24.0.0.9/full/Dockerfile.ubi.openjdk17
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.9-kernel-java17-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/24.0.0.9/full/Dockerfile.ubi.openjdk21 b/ga/24.0.0.9/full/Dockerfile.ubi.openjdk21
index f513607e0..fd54383a4 100644
--- a/ga/24.0.0.9/full/Dockerfile.ubi.openjdk21
+++ b/ga/24.0.0.9/full/Dockerfile.ubi.openjdk21
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.9-kernel-java21-openj9-ubi9-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/24.0.0.9/full/Dockerfile.ubi.openjdk8 b/ga/24.0.0.9/full/Dockerfile.ubi.openjdk8
index 39c90e5d4..69e73a5ae 100644
--- a/ga/24.0.0.9/full/Dockerfile.ubi.openjdk8
+++ b/ga/24.0.0.9/full/Dockerfile.ubi.openjdk8
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:24.0.0.9-kernel-java8-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/latest/full/Dockerfile.ubi.ibmjava8 b/ga/latest/full/Dockerfile.ubi.ibmjava8
index 8323de579..01284c358 100644
--- a/ga/latest/full/Dockerfile.ubi.ibmjava8
+++ b/ga/latest/full/Dockerfile.ubi.ibmjava8
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-ibmjava-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/latest/full/Dockerfile.ubi.openjdk11 b/ga/latest/full/Dockerfile.ubi.openjdk11
index 8669e3adf..76501226b 100644
--- a/ga/latest/full/Dockerfile.ubi.openjdk11
+++ b/ga/latest/full/Dockerfile.ubi.openjdk11
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java11-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/latest/full/Dockerfile.ubi.openjdk17 b/ga/latest/full/Dockerfile.ubi.openjdk17
index e38227406..0a796976d 100644
--- a/ga/latest/full/Dockerfile.ubi.openjdk17
+++ b/ga/latest/full/Dockerfile.ubi.openjdk17
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java17-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/latest/full/Dockerfile.ubi.openjdk21 b/ga/latest/full/Dockerfile.ubi.openjdk21
index bef9700b5..01b48eec7 100644
--- a/ga/latest/full/Dockerfile.ubi.openjdk21
+++ b/ga/latest/full/Dockerfile.ubi.openjdk21
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java21-openj9-ubi9-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 
diff --git a/ga/latest/full/Dockerfile.ubi.openjdk8 b/ga/latest/full/Dockerfile.ubi.openjdk8
index 0081f5719..f8602b4e6 100644
--- a/ga/latest/full/Dockerfile.ubi.openjdk8
+++ b/ga/latest/full/Dockerfile.ubi.openjdk8
@@ -36,7 +36,6 @@ RUN set -eux; \
   rm -rf /output/workarea /output/logs; \
   find /opt/ibm/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw;
 
-ARG PARENT_IMAGE=icr.io/appcafe/websphere-liberty:kernel-java8-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

From 08418fbceaf52325659c6e4ec5b6a9b9522ca7ba Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:15:10 -0400
Subject: [PATCH 3/7] Update test Dockerfiles to use PARENT_IMAGE build arg

---
 test/test-pet-clinic/Dockerfile   | 6 +++---
 test/test-stock-quote/Dockerfile  | 3 ++-
 test/test-stock-trader/Dockerfile | 3 ++-
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/test-pet-clinic/Dockerfile b/test/test-pet-clinic/Dockerfile
index b0d5a967b..d021c911a 100644
--- a/test/test-pet-clinic/Dockerfile
+++ b/test/test-pet-clinic/Dockerfile
@@ -1,6 +1,6 @@
 
-ARG IMAGE=ibmcom/websphere-liberty:kernel-java8-openj9-ubi
-FROM ${IMAGE} as staging
+ARG PARENT_IMAGE=ibmcom/websphere-liberty:kernel-java8-openj9-ubi
+FROM $PARENT_IMAGE as staging
 
 COPY --chown=1001:0 server.xml /config
 COPY --chown=1001:0 spring-petclinic-2.1.0.BUILD-SNAPSHOT.jar /staging/myFatApp.jar
@@ -13,7 +13,7 @@ RUN features.sh \
 
 RUN configure.sh
 
-FROM ${IMAGE}
+FROM $PARENT_IMAGE
 
 COPY --from=staging /config/server.xml /config/server.xml
 
diff --git a/test/test-stock-quote/Dockerfile b/test/test-stock-quote/Dockerfile
index 65d80026b..f904eb235 100644
--- a/test/test-stock-quote/Dockerfile
+++ b/test/test-stock-quote/Dockerfile
@@ -13,7 +13,8 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-FROM ibmcom/websphere-liberty:kernel-java17-openj9-ubi
+ARG PARENT_IMAGE=ibmcom/websphere-liberty:kernel-java17-openj9-ubi
+FROM $PARENT_IMAGE
 
 COPY --chown=1001:0 config /config/
 
diff --git a/test/test-stock-trader/Dockerfile b/test/test-stock-trader/Dockerfile
index dee22f51e..42f309d5b 100644
--- a/test/test-stock-trader/Dockerfile
+++ b/test/test-stock-trader/Dockerfile
@@ -12,7 +12,8 @@
 #   See the License for the specific language governing permissions and
 #   limitations under the License.
 
-FROM ibmcom/websphere-liberty:kernel-java8-openj9-ubi
+ARG PARENT_IMAGE=ibmcom/websphere-liberty:kernel-java8-openj9-ubi
+FROM $PARENT_IMAGE
 
 COPY --chown=1001:0 config /config/
 

From 03a984c5036450eec9f9467f58b23ee1df181a6c Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:24:03 -0400
Subject: [PATCH 4/7] Update beta Dockerfile to use PARENT_IMAGE

---
 beta/Dockerfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/beta/Dockerfile b/beta/Dockerfile
index fbbbaf2f6..410bce201 100644
--- a/beta/Dockerfile
+++ b/beta/Dockerfile
@@ -12,7 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ibmjava:8-jre
+ARG PARENT_IMAGE=ibmjava:8-jre
+FROM $PARENT_IMAGE
 
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \
       org.opencontainers.image.vendor="IBM" \

From 4591160e0752e42f37419b521831f1032f86ead3 Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Wed, 11 Sep 2024 14:24:14 -0400
Subject: [PATCH 5/7] Update create-new-release.sh to pattern match
 PARENT_IMAGE

---
 create-new-release.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/create-new-release.sh b/create-new-release.sh
index c4d3ca7d7..374764c3f 100755
--- a/create-new-release.sh
+++ b/create-new-release.sh
@@ -41,7 +41,8 @@ for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do
    if [[ "$file" == "./ga/$NEW_VERSION/"* && "$file" != "./ga/$NEW_VERSION/oidcProvider"* ]];
    then
       sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file;
-      sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file;
+      # sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file;
+      sed -i'.bak' -e "s/ARG PARENT_IMAGE=websphere-liberty:kernel/ARG PARENT_IMAGE=websphere-liberty:$NEW_VERSION-kernel/g" $file;
    fi
    
    # Clean up temp files

From e6210243621475f3bae895127b66b0a0981e58f2 Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Mon, 6 Jan 2025 13:12:51 -0500
Subject: [PATCH 6/7] Keep version replace sed command as fallback

---
 create-new-release.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/create-new-release.sh b/create-new-release.sh
index 374764c3f..bd4b60a44 100755
--- a/create-new-release.sh
+++ b/create-new-release.sh
@@ -41,8 +41,8 @@ for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do
    if [[ "$file" == "./ga/$NEW_VERSION/"* && "$file" != "./ga/$NEW_VERSION/oidcProvider"* ]];
    then
       sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file;
-      # sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file;
       sed -i'.bak' -e "s/ARG PARENT_IMAGE=websphere-liberty:kernel/ARG PARENT_IMAGE=websphere-liberty:$NEW_VERSION-kernel/g" $file;
+      sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file;
    fi
    
    # Clean up temp files

From dcac5ef4d98f41466f2d32323b74c26198f93391 Mon Sep 17 00:00:00 2001
From: kabicin <37311900+kabicin@users.noreply.github.com>
Date: Mon, 6 Jan 2025 13:22:00 -0500
Subject: [PATCH 7/7] Update create-new-release.sh

---
 create-new-release.sh | 1 -
 1 file changed, 1 deletion(-)

diff --git a/create-new-release.sh b/create-new-release.sh
index bd4b60a44..04fc6f5ff 100755
--- a/create-new-release.sh
+++ b/create-new-release.sh
@@ -42,7 +42,6 @@ for file in $(find ./ga/latest ./ga/$NEW_VERSION -name Dockerfile.*); do
    then
       sed -i'.bak' -e "s/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:kernel/ARG PARENT_IMAGE=icr.io\/appcafe\/websphere-liberty:$NEW_VERSION-kernel/g" $file;
       sed -i'.bak' -e "s/ARG PARENT_IMAGE=websphere-liberty:kernel/ARG PARENT_IMAGE=websphere-liberty:$NEW_VERSION-kernel/g" $file;
-      sed -i'.bak' -e "s/FROM websphere-liberty:kernel/FROM websphere-liberty:$NEW_VERSION-kernel/g" $file;
    fi
    
    # Clean up temp files