WASdev · kabicin · Sep 11, 2024 · Sep 11, 2024 · Sep 11, 2024 · Sep 11, 2024
diff --git 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" \

diff --git 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

diff --git a/ga/24.0.0.6/full/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.6/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.6-kernel-java8-ibmjava-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

diff --git a/ga/24.0.0.6/full/Dockerfile.ubi.openjdk11 b/ga/24.0.0.6/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.6-kernel-java11-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

diff --git a/ga/24.0.0.6/full/Dockerfile.ubi.openjdk17 b/ga/24.0.0.6/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.6-kernel-java17-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

diff --git a/ga/24.0.0.6/full/Dockerfile.ubi.openjdk21 b/ga/24.0.0.6/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.6-kernel-java21-openj9-ubi9-minimal
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

diff --git a/ga/24.0.0.6/full/Dockerfile.ubi.openjdk8 b/ga/24.0.0.6/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.6-kernel-java8-openj9-ubi
 FROM $PARENT_IMAGE
 ARG VERBOSE=false
 

diff --git a/ga/24.0.0.6/full/Dockerfile.ubuntu.ibmjava8 b/ga/24.0.0.6/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.6-kernel-java8-ibmjava
+ARG PARENT_IMAGE=websphere-liberty:24.0.0.6-kernel-java8-ibmjava
+FROM $PARENT_IMAGE
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""

diff --git a/ga/24.0.0.6/full/Dockerfile.ubuntu.openjdk11 b/ga/24.0.0.6/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.6-kernel-java11-openj9
+ARG PARENT_IMAGE=websphere-liberty:24.0.0.6-kernel-java11-openj9
+FROM $PARENT_IMAGE
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""

diff --git a/ga/24.0.0.6/full/Dockerfile.ubuntu.openjdk17 b/ga/24.0.0.6/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.6-kernel-java17-openj9
+ARG PARENT_IMAGE=websphere-liberty:24.0.0.6-kernel-java17-openj9
+FROM $PARENT_IMAGE
 
 ARG VERBOSE=false
 ARG REPOSITORIES_PROPERTIES=""

diff --git a/ga/24.0.0.6/kernel/Dockerfile.ubi.ibmjava8 b/ga/24.0.0.6/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.6/kernel/Dockerfile.ubi.openjdk11 b/ga/24.0.0.6/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.6/kernel/Dockerfile.ubi.openjdk17 b/ga/24.0.0.6/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.6/kernel/Dockerfile.ubi.openjdk21 b/ga/24.0.0.6/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.6/kernel/Dockerfile.ubi.openjdk8 b/ga/24.0.0.6/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.6/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/24.0.0.6/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.6/kernel/Dockerfile.ubuntu.openjdk11 b/ga/24.0.0.6/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.6/kernel/Dockerfile.ubuntu.openjdk17 b/ga/24.0.0.6/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.6/oidcProvider/Dockerfile b/ga/24.0.0.6/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.6/oidcProvider/Dockerfile.java11 b/ga/24.0.0.6/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.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
@@ -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
@@ -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
@@ -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
@@ -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/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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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