Skip to content

Commit c110668

Browse files
committed
Update tests/samples to use PARENT_IMAGE build arg
1 parent a6fa7b3 commit c110668

File tree

6 files changed

+13
-12
lines changed

6 files changed

+13
-12
lines changed

Diff for: build/build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ then
5252
fi
5353
if [ ! -z "$from" ]
5454
then
55-
buildCommand="$buildCommand --build-arg IMAGE=$from"
55+
buildCommand="$buildCommand --build-arg PARENT_IMAGE=$from"
5656
fi
5757

5858
buildCommand="$buildCommand ."

Diff for: build/test-pet-clinic/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG IMAGE=openliberty/open-liberty:kernel-slim-java8-openj9-ubi
2-
FROM ${IMAGE} as staging
1+
ARG PARENT_IMAGE=openliberty/open-liberty:kernel-slim-java8-openj9-ubi
2+
FROM $PARENT_IMAGE as staging
33

44
# Copy server config so springBootUtility can be downloaded by featureUtility in the next step
55
COPY --chown=1001:0 server.xml /config/server.xml
@@ -14,7 +14,7 @@ RUN springBootUtility thin \
1414
--targetThinAppPath=/staging/myThinApp.jar \
1515
--targetLibCachePath=/staging/lib.index.cache
1616

17-
FROM ${IMAGE}
17+
FROM $PARENT_IMAGE
1818
COPY --chown=1001:0 server.xml /config/server.xml
1919

2020
ARG VERBOSE=false

Diff for: build/test-stock-quote/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG IMAGE=openliberty/open-liberty:kernel-slim-ubi
2-
FROM ${IMAGE}
1+
ARG PARENT_IMAGE=openliberty/open-liberty:kernel-slim-ubi
2+
FROM $PARENT_IMAGE
33

44
ARG VERBOSE=false
55

Diff for: build/test-stock-trader/Dockerfile

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG IMAGE=openliberty/open-liberty:kernel-slim-ubi
2-
FROM ${IMAGE}
1+
ARG PARENT_IMAGE=openliberty/open-liberty:kernel-slim-ubi
2+
FROM $PARENT_IMAGE
33

44
ARG VERBOSE=false
55

Diff for: samples/security/Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
FROM openliberty/open-liberty:kernel-slim-ubi
1+
ARG PARENT_IMAGE=openliberty/open-liberty:kernel-slim-ubi
2+
FROM $PARENT_IMAGE
23

34
# Add my app and config
45
COPY --chown=1001:0 server.xml /config/

Diff for: samples/spring-petclinic/Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
ARG IMAGE=openliberty/open-liberty:kernel-slim-java8-openj9-ubi
2-
FROM ${IMAGE} as staging
1+
ARG PARENT_IMAGE=openliberty/open-liberty:kernel-slim-java8-openj9-ubi
2+
FROM $PARENT_IMAGE as staging
33

44
# Copy server config so springBootUtility can be downloaded by featureUtility in the next step
55
COPY --chown=1001:0 server.xml /config/server.xml
@@ -14,7 +14,7 @@ RUN springBootUtility thin \
1414
--targetThinAppPath=/staging/myThinApp.jar \
1515
--targetLibCachePath=/staging/lib.index.cache
1616

17-
FROM ${IMAGE}
17+
FROM $PARENT_IMAGE
1818
COPY --chown=1001:0 server.xml /config
1919

2020
# This script will add the requested XML snippets to enable Liberty features and grow image to be fit-for-purpose using featureUtility

0 commit comments

Comments
 (0)