diff --git a/build/build.sh b/build/build.sh index 4f14dfc38..ace001fda 100755 --- a/build/build.sh +++ b/build/build.sh @@ -52,7 +52,7 @@ then fi if [ ! -z "$from" ] then - buildCommand="$buildCommand --build-arg IMAGE=$from" + buildCommand="$buildCommand --build-arg PARENT_IMAGE=$from" fi buildCommand="$buildCommand ." diff --git a/build/test-pet-clinic/Dockerfile b/build/test-pet-clinic/Dockerfile index a5026a691..f41322491 100644 --- a/build/test-pet-clinic/Dockerfile +++ b/build/test-pet-clinic/Dockerfile @@ -1,5 +1,5 @@ -ARG IMAGE=openliberty/open-liberty:kernel-slim-java8-openj9-ubi -FROM ${IMAGE} as staging +ARG PARENT_IMAGE=openliberty/open-liberty:kernel-slim-java8-openj9-ubi +FROM $PARENT_IMAGE as staging # Copy server config so springBootUtility can be downloaded by featureUtility in the next step COPY --chown=1001:0 server.xml /config/server.xml @@ -14,7 +14,7 @@ RUN springBootUtility thin \ --targetThinAppPath=/staging/myThinApp.jar \ --targetLibCachePath=/staging/lib.index.cache -FROM ${IMAGE} +FROM $PARENT_IMAGE COPY --chown=1001:0 server.xml /config/server.xml ARG VERBOSE=false diff --git a/build/test-stock-quote/Dockerfile b/build/test-stock-quote/Dockerfile index 0a41c03c9..37c3cdad1 100644 --- a/build/test-stock-quote/Dockerfile +++ b/build/test-stock-quote/Dockerfile @@ -1,5 +1,5 @@ -ARG IMAGE=openliberty/open-liberty:kernel-slim-ubi -FROM ${IMAGE} +ARG PARENT_IMAGE=openliberty/open-liberty:kernel-slim-ubi +FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/build/test-stock-trader/Dockerfile b/build/test-stock-trader/Dockerfile index cdb93152f..cc3e2ac29 100644 --- a/build/test-stock-trader/Dockerfile +++ b/build/test-stock-trader/Dockerfile @@ -1,5 +1,5 @@ -ARG IMAGE=openliberty/open-liberty:kernel-slim-ubi -FROM ${IMAGE} +ARG PARENT_IMAGE=openliberty/open-liberty:kernel-slim-ubi +FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/releases/24.0.0.12/full/Dockerfile.ubi.ibmjava8 b/releases/24.0.0.12/full/Dockerfile.ubi.ibmjava8 index ff9cec650..f30bf2863 100644 --- a/releases/24.0.0.12/full/Dockerfile.ubi.ibmjava8 +++ b/releases/24.0.0.12/full/Dockerfile.ubi.ibmjava8 @@ -1,4 +1,5 @@ -FROM ibmjava:8-ubi AS getRuntime +ARG PARENT_IMAGE=ibmjava:8-ubi +FROM $PARENT_IMAGE AS getRuntime USER root @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM ibmjava:8-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.12/full/Dockerfile.ubi.openjdk11 b/releases/24.0.0.12/full/Dockerfile.ubi.openjdk11 index f79f84c39..04510ec52 100644 --- a/releases/24.0.0.12/full/Dockerfile.ubi.openjdk11 +++ b/releases/24.0.0.12/full/Dockerfile.ubi.openjdk11 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.12/full/Dockerfile.ubi.openjdk17 b/releases/24.0.0.12/full/Dockerfile.ubi.openjdk17 index f130b68aa..5e7574a70 100644 --- a/releases/24.0.0.12/full/Dockerfile.ubi.openjdk17 +++ b/releases/24.0.0.12/full/Dockerfile.ubi.openjdk17 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.12/full/Dockerfile.ubi.openjdk21 b/releases/24.0.0.12/full/Dockerfile.ubi.openjdk21 index 4f7ee6eec..2c0963ed2 100644 --- a/releases/24.0.0.12/full/Dockerfile.ubi.openjdk21 +++ b/releases/24.0.0.12/full/Dockerfile.ubi.openjdk21 @@ -1,5 +1,4 @@ ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java21-openj9-ubi-minimal - FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -33,7 +32,6 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ol/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:24.0.0.12-kernel-slim-java21-openj9-ubi-minimal FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/releases/24.0.0.12/full/Dockerfile.ubi.openjdk8 b/releases/24.0.0.12/full/Dockerfile.ubi.openjdk8 index 9fa6929f5..79c2d044c 100644 --- a/releases/24.0.0.12/full/Dockerfile.ubi.openjdk8 +++ b/releases/24.0.0.12/full/Dockerfile.ubi.openjdk8 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.12/full/Dockerfile.ubuntu.openjdk11 b/releases/24.0.0.12/full/Dockerfile.ubuntu.openjdk11 index cd7cddf97..6148b6c72 100644 --- a/releases/24.0.0.12/full/Dockerfile.ubuntu.openjdk11 +++ b/releases/24.0.0.12/full/Dockerfile.ubuntu.openjdk11 @@ -1,4 +1,5 @@ -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/releases/24.0.0.12/full/Dockerfile.ubuntu.openjdk17 b/releases/24.0.0.12/full/Dockerfile.ubuntu.openjdk17 index 4189f7322..999e8c483 100644 --- a/releases/24.0.0.12/full/Dockerfile.ubuntu.openjdk17 +++ b/releases/24.0.0.12/full/Dockerfile.ubuntu.openjdk17 @@ -1,4 +1,5 @@ -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/releases/24.0.0.12/full/Dockerfile.ubuntu.openjdk8 b/releases/24.0.0.12/full/Dockerfile.ubuntu.openjdk8 index 6daa56f8e..c0ee285d5 100644 --- a/releases/24.0.0.12/full/Dockerfile.ubuntu.openjdk8 +++ b/releases/24.0.0.12/full/Dockerfile.ubuntu.openjdk8 @@ -1,4 +1,5 @@ -FROM ibm-semeru-runtimes:open-8-jre-jammy +ARG PARENT_IMAGE=ibm-semeru-runtimes:open-8-jre-jammy +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.ibmjava8 b/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.ibmjava8 index ceb28f9a0..b027e68d2 100644 --- a/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.ibmjava8 +++ b/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.ibmjava8 @@ -1,4 +1,5 @@ -FROM ibmjava:8-ubi AS getRuntime +ARG PARENT_IMAGE=ibmjava:8-ubi +FROM $PARENT_IMAGE AS getRuntime USER root @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM ibmjava:8-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk11 b/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk11 index 873a7dd86..6a17652d8 100644 --- a/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk11 +++ b/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk11 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk17 b/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk17 index 76779b6c2..e8c84e014 100644 --- a/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk17 +++ b/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk17 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk21 b/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk21 index 8279a02f4..a07c4c943 100644 --- a/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk21 +++ b/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk21 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN microdnf -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk8 b/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk8 index a9a4eaa2d..253f96510 100644 --- a/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk8 +++ b/releases/24.0.0.12/kernel-slim/Dockerfile.ubi.openjdk8 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk11 b/releases/24.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk11 index 8659c091d..6a75a733b 100644 --- a/releases/24.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk11 +++ b/releases/24.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk11 @@ -1,4 +1,5 @@ -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/releases/24.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk17 b/releases/24.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk17 index 9d881e9bc..de1161fdb 100644 --- a/releases/24.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk17 +++ b/releases/24.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk17 @@ -1,4 +1,5 @@ -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/releases/24.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk8 b/releases/24.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk8 index ed193b501..845737565 100644 --- a/releases/24.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk8 +++ b/releases/24.0.0.12/kernel-slim/Dockerfile.ubuntu.openjdk8 @@ -1,4 +1,5 @@ -FROM ibm-semeru-runtimes:open-8-jre-jammy +ARG PARENT_IMAGE=ibm-semeru-runtimes:open-8-jre-jammy +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.9/full/Dockerfile.ubi.ibmjava8 b/releases/24.0.0.9/full/Dockerfile.ubi.ibmjava8 index 5df64af96..323e79a47 100644 --- a/releases/24.0.0.9/full/Dockerfile.ubi.ibmjava8 +++ b/releases/24.0.0.9/full/Dockerfile.ubi.ibmjava8 @@ -1,4 +1,5 @@ -FROM ibmjava:8-ubi AS getRuntime +ARG PARENT_IMAGE=ibmjava:8-ubi +FROM $PARENT_IMAGE AS getRuntime USER root @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM ibmjava:8-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.9/full/Dockerfile.ubi.openjdk11 b/releases/24.0.0.9/full/Dockerfile.ubi.openjdk11 index 2d0c47ca0..c68f05006 100644 --- a/releases/24.0.0.9/full/Dockerfile.ubi.openjdk11 +++ b/releases/24.0.0.9/full/Dockerfile.ubi.openjdk11 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.9/full/Dockerfile.ubi.openjdk17 b/releases/24.0.0.9/full/Dockerfile.ubi.openjdk17 index 6eeafd327..695ad23ff 100644 --- a/releases/24.0.0.9/full/Dockerfile.ubi.openjdk17 +++ b/releases/24.0.0.9/full/Dockerfile.ubi.openjdk17 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.9/full/Dockerfile.ubi.openjdk21 b/releases/24.0.0.9/full/Dockerfile.ubi.openjdk21 index 7db100c94..e2cf48808 100644 --- a/releases/24.0.0.9/full/Dockerfile.ubi.openjdk21 +++ b/releases/24.0.0.9/full/Dockerfile.ubi.openjdk21 @@ -1,5 +1,4 @@ ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:24.0.0.9-kernel-slim-java21-openj9-ubi-minimal - FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -33,7 +32,6 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ol/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:24.0.0.9-kernel-slim-java21-openj9-ubi-minimal FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/releases/24.0.0.9/full/Dockerfile.ubi.openjdk8 b/releases/24.0.0.9/full/Dockerfile.ubi.openjdk8 index 3373c4a2d..dddfd984d 100644 --- a/releases/24.0.0.9/full/Dockerfile.ubi.openjdk8 +++ b/releases/24.0.0.9/full/Dockerfile.ubi.openjdk8 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.9/full/Dockerfile.ubuntu.openjdk11 b/releases/24.0.0.9/full/Dockerfile.ubuntu.openjdk11 index c5b19c3c2..4bbec3498 100644 --- a/releases/24.0.0.9/full/Dockerfile.ubuntu.openjdk11 +++ b/releases/24.0.0.9/full/Dockerfile.ubuntu.openjdk11 @@ -1,4 +1,5 @@ -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/releases/24.0.0.9/full/Dockerfile.ubuntu.openjdk17 b/releases/24.0.0.9/full/Dockerfile.ubuntu.openjdk17 index 13695bb8c..bf3a9342c 100644 --- a/releases/24.0.0.9/full/Dockerfile.ubuntu.openjdk17 +++ b/releases/24.0.0.9/full/Dockerfile.ubuntu.openjdk17 @@ -1,4 +1,5 @@ -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/releases/24.0.0.9/full/Dockerfile.ubuntu.openjdk8 b/releases/24.0.0.9/full/Dockerfile.ubuntu.openjdk8 index 1ed44d336..9c94b2c9a 100644 --- a/releases/24.0.0.9/full/Dockerfile.ubuntu.openjdk8 +++ b/releases/24.0.0.9/full/Dockerfile.ubuntu.openjdk8 @@ -1,4 +1,5 @@ -FROM ibm-semeru-runtimes:open-8-jre-jammy +ARG PARENT_IMAGE=ibm-semeru-runtimes:open-8-jre-jammy +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.ibmjava8 b/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.ibmjava8 index 7e7689aeb..1a58100e4 100644 --- a/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.ibmjava8 +++ b/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.ibmjava8 @@ -1,4 +1,5 @@ -FROM ibmjava:8-ubi AS getRuntime +ARG PARENT_IMAGE=ibmjava:8-ubi +FROM $PARENT_IMAGE AS getRuntime USER root @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM ibmjava:8-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk11 b/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk11 index 8c6406f9a..47cda59f2 100644 --- a/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk11 +++ b/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk11 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk17 b/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk17 index c86600d97..dbb0b5f4a 100644 --- a/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk17 +++ b/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk17 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk21 b/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk21 index 9faf3d0b6..7e2bf8948 100644 --- a/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk21 +++ b/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk21 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN microdnf -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk8 b/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk8 index 4fd708dd1..83c7ac922 100644 --- a/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk8 +++ b/releases/24.0.0.9/kernel-slim/Dockerfile.ubi.openjdk8 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/24.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk11 b/releases/24.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk11 index ccfba0e1f..6bb30a2f8 100644 --- a/releases/24.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk11 +++ b/releases/24.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk11 @@ -1,4 +1,5 @@ -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/releases/24.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk17 b/releases/24.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk17 index a4e5f543d..d23b688f9 100644 --- a/releases/24.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk17 +++ b/releases/24.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk17 @@ -1,4 +1,5 @@ -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/releases/24.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk8 b/releases/24.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk8 index 66f48f972..ce34d5ba0 100644 --- a/releases/24.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk8 +++ b/releases/24.0.0.9/kernel-slim/Dockerfile.ubuntu.openjdk8 @@ -1,4 +1,5 @@ -FROM ibm-semeru-runtimes:open-8-jre-jammy +ARG PARENT_IMAGE=ibm-semeru-runtimes:open-8-jre-jammy +FROM $PARENT_IMAGE USER root diff --git a/releases/latest/beta/Dockerfile.ubi.openjdk21 b/releases/latest/beta/Dockerfile.ubi.openjdk21 index 04dbc280a..039af2756 100644 --- a/releases/latest/beta/Dockerfile.ubi.openjdk21 +++ b/releases/latest/beta/Dockerfile.ubi.openjdk21 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN microdnf -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal +FROM $PARENT_IMAGE USER root diff --git a/releases/latest/beta/Dockerfile.ubuntu.openjdk11 b/releases/latest/beta/Dockerfile.ubuntu.openjdk11 index 2c32d201f..14dcde942 100644 --- a/releases/latest/beta/Dockerfile.ubuntu.openjdk11 +++ b/releases/latest/beta/Dockerfile.ubuntu.openjdk11 @@ -1,4 +1,5 @@ -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/releases/latest/beta/Dockerfile.ubuntu.openjdk17 b/releases/latest/beta/Dockerfile.ubuntu.openjdk17 index 65b457f3c..188da9e61 100644 --- a/releases/latest/beta/Dockerfile.ubuntu.openjdk17 +++ b/releases/latest/beta/Dockerfile.ubuntu.openjdk17 @@ -1,4 +1,5 @@ -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/releases/latest/beta/Dockerfile.ubuntu.openjdk8 b/releases/latest/beta/Dockerfile.ubuntu.openjdk8 index 11afb5982..ea6d8c5a2 100644 --- a/releases/latest/beta/Dockerfile.ubuntu.openjdk8 +++ b/releases/latest/beta/Dockerfile.ubuntu.openjdk8 @@ -1,4 +1,5 @@ -FROM ibm-semeru-runtimes:open-8-jre-jammy +ARG PARENT_IMAGE=ibm-semeru-runtimes:open-8-jre-jammy +FROM $PARENT_IMAGE USER root diff --git a/releases/latest/full/Dockerfile.ubi.ibmjava8 b/releases/latest/full/Dockerfile.ubi.ibmjava8 index ff9cec650..f30bf2863 100644 --- a/releases/latest/full/Dockerfile.ubi.ibmjava8 +++ b/releases/latest/full/Dockerfile.ubi.ibmjava8 @@ -1,4 +1,5 @@ -FROM ibmjava:8-ubi AS getRuntime +ARG PARENT_IMAGE=ibmjava:8-ubi +FROM $PARENT_IMAGE AS getRuntime USER root @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM ibmjava:8-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/latest/full/Dockerfile.ubi.openjdk11 b/releases/latest/full/Dockerfile.ubi.openjdk11 index f79f84c39..04510ec52 100644 --- a/releases/latest/full/Dockerfile.ubi.openjdk11 +++ b/releases/latest/full/Dockerfile.ubi.openjdk11 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/latest/full/Dockerfile.ubi.openjdk17 b/releases/latest/full/Dockerfile.ubi.openjdk17 index f130b68aa..5e7574a70 100644 --- a/releases/latest/full/Dockerfile.ubi.openjdk17 +++ b/releases/latest/full/Dockerfile.ubi.openjdk17 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/latest/full/Dockerfile.ubi.openjdk21 b/releases/latest/full/Dockerfile.ubi.openjdk21 index 0bdbffd6e..3f705fd48 100644 --- a/releases/latest/full/Dockerfile.ubi.openjdk21 +++ b/releases/latest/full/Dockerfile.ubi.openjdk21 @@ -1,5 +1,4 @@ ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:kernel-slim-java21-openj9-ubi-minimal - FROM $PARENT_IMAGE AS installBundle ARG VERBOSE=false @@ -33,7 +32,6 @@ RUN set -eux; \ rm -rf /output/workarea /output/logs; \ find /opt/ol/wlp ! -perm -g=rw -print0 | xargs -r -0 chmod g+rw; -ARG PARENT_IMAGE=icr.io/appcafe/open-liberty:kernel-slim-java21-openj9-ubi-minimal FROM $PARENT_IMAGE ARG VERBOSE=false diff --git a/releases/latest/full/Dockerfile.ubi.openjdk8 b/releases/latest/full/Dockerfile.ubi.openjdk8 index 9fa6929f5..79c2d044c 100644 --- a/releases/latest/full/Dockerfile.ubi.openjdk8 +++ b/releases/latest/full/Dockerfile.ubi.openjdk8 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/latest/full/Dockerfile.ubuntu.openjdk11 b/releases/latest/full/Dockerfile.ubuntu.openjdk11 index cd7cddf97..6148b6c72 100644 --- a/releases/latest/full/Dockerfile.ubuntu.openjdk11 +++ b/releases/latest/full/Dockerfile.ubuntu.openjdk11 @@ -1,4 +1,5 @@ -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/releases/latest/full/Dockerfile.ubuntu.openjdk17 b/releases/latest/full/Dockerfile.ubuntu.openjdk17 index 4189f7322..999e8c483 100644 --- a/releases/latest/full/Dockerfile.ubuntu.openjdk17 +++ b/releases/latest/full/Dockerfile.ubuntu.openjdk17 @@ -1,4 +1,5 @@ -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/releases/latest/full/Dockerfile.ubuntu.openjdk8 b/releases/latest/full/Dockerfile.ubuntu.openjdk8 index 6daa56f8e..c0ee285d5 100644 --- a/releases/latest/full/Dockerfile.ubuntu.openjdk8 +++ b/releases/latest/full/Dockerfile.ubuntu.openjdk8 @@ -1,4 +1,5 @@ -FROM ibm-semeru-runtimes:open-8-jre-jammy +ARG PARENT_IMAGE=ibm-semeru-runtimes:open-8-jre-jammy +FROM $PARENT_IMAGE USER root diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 b/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 index ceb28f9a0..b027e68d2 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 +++ b/releases/latest/kernel-slim/Dockerfile.ubi.ibmjava8 @@ -1,4 +1,5 @@ -FROM ibmjava:8-ubi AS getRuntime +ARG PARENT_IMAGE=ibmjava:8-ubi +FROM $PARENT_IMAGE AS getRuntime USER root @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM ibmjava:8-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11 b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11 index 873a7dd86..6a17652d8 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11 +++ b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk11 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-11-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17 b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17 index 76779b6c2..e8c84e014 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17 +++ b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk17 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-17-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk21 b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk21 index 8279a02f4..a07c4c943 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk21 +++ b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk21 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN microdnf -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-21-jre-ubi9-minimal +FROM $PARENT_IMAGE USER root diff --git a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8 b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8 index a9a4eaa2d..253f96510 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8 +++ b/releases/latest/kernel-slim/Dockerfile.ubi.openjdk8 @@ -1,4 +1,5 @@ -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 @@ -24,7 +25,7 @@ RUN yum -y install shadow-utils wget unzip openssl \ && chown -R 1001:0 /opt/ol/wlp \ && chmod -R g+rw /opt/ol/wlp -FROM icr.io/appcafe/ibm-semeru-runtimes:open-8-jdk-ubi +FROM $PARENT_IMAGE USER root diff --git a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11 b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11 index 8659c091d..6a75a733b 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11 +++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk11 @@ -1,4 +1,5 @@ -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/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17 b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17 index 9d881e9bc..de1161fdb 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17 +++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk17 @@ -1,4 +1,5 @@ -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/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8 b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8 index ed193b501..845737565 100644 --- a/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8 +++ b/releases/latest/kernel-slim/Dockerfile.ubuntu.openjdk8 @@ -1,4 +1,5 @@ -FROM ibm-semeru-runtimes:open-8-jre-jammy +ARG PARENT_IMAGE=ibm-semeru-runtimes:open-8-jre-jammy +FROM $PARENT_IMAGE USER root diff --git a/samples/security/Dockerfile b/samples/security/Dockerfile index 88799a9e1..6b5332df0 100644 --- a/samples/security/Dockerfile +++ b/samples/security/Dockerfile @@ -1,4 +1,5 @@ -FROM openliberty/open-liberty:kernel-slim-ubi +ARG PARENT_IMAGE=openliberty/open-liberty:kernel-slim-ubi +FROM $PARENT_IMAGE # Add my app and config COPY --chown=1001:0 server.xml /config/ diff --git a/samples/spring-petclinic/Dockerfile b/samples/spring-petclinic/Dockerfile index cf812caa7..7d45d04d4 100644 --- a/samples/spring-petclinic/Dockerfile +++ b/samples/spring-petclinic/Dockerfile @@ -1,5 +1,5 @@ -ARG IMAGE=openliberty/open-liberty:kernel-slim-java8-openj9-ubi -FROM ${IMAGE} as staging +ARG PARENT_IMAGE=openliberty/open-liberty:kernel-slim-java8-openj9-ubi +FROM $PARENT_IMAGE as staging # Copy server config so springBootUtility can be downloaded by featureUtility in the next step COPY --chown=1001:0 server.xml /config/server.xml @@ -14,7 +14,7 @@ RUN springBootUtility thin \ --targetThinAppPath=/staging/myThinApp.jar \ --targetLibCachePath=/staging/lib.index.cache -FROM ${IMAGE} +FROM $PARENT_IMAGE COPY --chown=1001:0 server.xml /config # This script will add the requested XML snippets to enable Liberty features and grow image to be fit-for-purpose using featureUtility