Add PARENT_IMAGE build arg

kabicin · kabicin · commit 98778a77c8d3 · 2024-09-11T14:05:07.000-04:00
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.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
 
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk17 b/ga/latest/kernel/Dockerfile.ubi.openjdk17
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk21 b/ga/latest/kernel/Dockerfile.ubi.openjdk21
diff --git a/ga/latest/kernel/Dockerfile.ubi.openjdk8 b/ga/latest/kernel/Dockerfile.ubi.openjdk8
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/latest/kernel/Dockerfile.ubuntu.ibmjava8
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk11 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk11
diff --git a/ga/latest/kernel/Dockerfile.ubuntu.openjdk17 b/ga/latest/kernel/Dockerfile.ubuntu.openjdk17
diff --git a/ga/latest/oidcProvider/Dockerfile b/ga/latest/oidcProvider/Dockerfile
diff --git a/ga/latest/oidcProvider/Dockerfile.java11 b/ga/latest/oidcProvider/Dockerfile.java11
diff --git a/ga/production-upgrade/Dockerfile b/ga/production-upgrade/Dockerfile
diff --git a/samples/security/Dockerfile b/samples/security/Dockerfile
