From c1007faf1d02b5359c49e97ba2f9e4c979920d33 Mon Sep 17 00:00:00 2001 From: Michal Broz Date: Fri, 30 Jun 2023 15:10:24 -0500 Subject: [PATCH] remove ARG substitution in FROM for Ubuntu full --- ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 | 6 ++---- ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 | 6 ++---- ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 | 6 ++---- ga/latest/full/Dockerfile.ubuntu.ibmjava8 | 6 ++---- ga/latest/full/Dockerfile.ubuntu.openjdk11 | 6 ++---- ga/latest/full/Dockerfile.ubuntu.openjdk17 | 6 ++---- 6 files changed, 12 insertions(+), 24 deletions(-) diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 index 4e919d2ac..b5583be27 100644 --- a/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 +++ b/ga/23.0.0.6/full/Dockerfile.ubuntu.ibmjava8 @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=websphere-liberty -FROM $PARENT_IMAGE:23.0.0.6-kernel-java8-ibmjava AS installBundle +FROM websphere-liberty:23.0.0.6-kernel-java8-ibmjava AS installBundle ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" @@ -35,8 +34,7 @@ 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=websphere-liberty -FROM $PARENT_IMAGE:23.0.0.6-kernel-java8-ibmjava +FROM websphere-liberty:23.0.0.6-kernel-java8-ibmjava ARG VERBOSE=false # Copy the runtime diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 index 56a35b272..d983f604e 100644 --- a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 +++ b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk11 @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=websphere-liberty -FROM $PARENT_IMAGE:23.0.0.6-kernel-java11-openj9 AS installBundle +FROM websphere-liberty:23.0.0.6-kernel-java11-openj9 AS installBundle USER root @@ -38,8 +37,7 @@ 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=websphere-liberty -FROM $PARENT_IMAGE:23.0.0.6-kernel-java11-openj9 +FROM websphere-liberty:23.0.0.6-kernel-java11-openj9 ARG VERBOSE=false # Copy the runtime diff --git a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 index 9588f34e2..28fb016dd 100644 --- a/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 +++ b/ga/23.0.0.6/full/Dockerfile.ubuntu.openjdk17 @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=websphere-liberty -FROM $PARENT_IMAGE:23.0.0.6-kernel-java17-openj9 AS installBundle +FROM websphere-liberty:23.0.0.6-kernel-java17-openj9 AS installBundle USER root @@ -38,8 +37,7 @@ 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=websphere-liberty -FROM $PARENT_IMAGE:23.0.0.6-kernel-java17-openj9 +FROM websphere-liberty:23.0.0.6-kernel-java17-openj9 ARG VERBOSE=false # Copy the runtime diff --git a/ga/latest/full/Dockerfile.ubuntu.ibmjava8 b/ga/latest/full/Dockerfile.ubuntu.ibmjava8 index c5a11bb2c..395a6922a 100644 --- a/ga/latest/full/Dockerfile.ubuntu.ibmjava8 +++ b/ga/latest/full/Dockerfile.ubuntu.ibmjava8 @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=websphere-liberty -FROM $PARENT_IMAGE:kernel AS installBundle +FROM websphere-liberty:kernel AS installBundle ARG VERBOSE=false ARG REPOSITORIES_PROPERTIES="" @@ -35,8 +34,7 @@ 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=websphere-liberty -FROM $PARENT_IMAGE:kernel +FROM websphere-liberty:kernel ARG VERBOSE=false # Copy the runtime diff --git a/ga/latest/full/Dockerfile.ubuntu.openjdk11 b/ga/latest/full/Dockerfile.ubuntu.openjdk11 index 330db16fd..02fd841cd 100644 --- a/ga/latest/full/Dockerfile.ubuntu.openjdk11 +++ b/ga/latest/full/Dockerfile.ubuntu.openjdk11 @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=websphere-liberty -FROM $PARENT_IMAGE:kernel-java11-openj9 AS installBundle +FROM websphere-liberty:kernel-java11-openj9 AS installBundle USER root @@ -38,8 +37,7 @@ 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=websphere-liberty -FROM $PARENT_IMAGE:kernel-java11-openj9 +FROM websphere-liberty:kernel-java11-openj9 ARG VERBOSE=false # Copy the runtime diff --git a/ga/latest/full/Dockerfile.ubuntu.openjdk17 b/ga/latest/full/Dockerfile.ubuntu.openjdk17 index 71f61369f..1241066c1 100644 --- a/ga/latest/full/Dockerfile.ubuntu.openjdk17 +++ b/ga/latest/full/Dockerfile.ubuntu.openjdk17 @@ -12,8 +12,7 @@ # See the License for the specific language governing permissions and # limitations under the License. -ARG PARENT_IMAGE=websphere-liberty -FROM $PARENT_IMAGE:kernel-java17-openj9 AS installBundle +FROM websphere-liberty:kernel-java17-openj9 AS installBundle USER root @@ -38,8 +37,7 @@ 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=websphere-liberty -FROM $PARENT_IMAGE:kernel-java17-openj9 +FROM websphere-liberty:kernel-java17-openj9 ARG VERBOSE=false # Copy the runtime