diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml index d65c984..3941175 100644 --- a/finish/inventory/pom.xml +++ b/finish/inventory/pom.xml @@ -54,7 +54,7 @@ org.junit.jupiter junit-jupiter - 5.11.0 + 5.11.1 test diff --git a/finish/system/pom.xml b/finish/system/pom.xml index d4570dc..0098aee 100644 --- a/finish/system/pom.xml +++ b/finish/system/pom.xml @@ -43,7 +43,7 @@ org.junit.jupiter junit-jupiter - 5.11.0 + 5.11.1 test diff --git a/scripts/dockerImageTest.sh b/scripts/dockerImageTest.sh index 1a19c20..f5736b3 100755 --- a/scripts/dockerImageTest.sh +++ b/scripts/dockerImageTest.sh @@ -1,9 +1,10 @@ #!/bin/bash -while getopts t:d: flag; +while getopts t:d:v: flag; do case "${flag}" in t) DATE="${OPTARG}";; d) DRIVER="${OPTARG}";; + v) OL_LEVEL="${OPTARG}";; *) echo "Invalid option";; esac done @@ -13,7 +14,11 @@ echo "Testing latest OpenLiberty Docker image" sed -i "\#liberty-maven-plugin#ahttps://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER" inventory/pom.xml system/pom.xml cat inventory/pom.xml system/pom.xml -sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi;g" system/Dockerfile inventory/Dockerfile +if [[ "$OL_LEVEL" != "" ]]; then + sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java11-openj9-ubi;g" system/Dockerfile inventory/Dockerfile +else + sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi;g" system/Dockerfile inventory/Dockerfile +fi sed -i "s;RUN features.sh;;g" system/Dockerfile inventory/Dockerfile cat system/Dockerfile inventory/Dockerfile diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml index c0e84a4..81262a8 100644 --- a/start/inventory/pom.xml +++ b/start/inventory/pom.xml @@ -46,7 +46,7 @@ org.junit.jupiter junit-jupiter - 5.11.0 + 5.11.1 test diff --git a/start/system/pom.xml b/start/system/pom.xml index d4570dc..0098aee 100644 --- a/start/system/pom.xml +++ b/start/system/pom.xml @@ -43,7 +43,7 @@ org.junit.jupiter junit-jupiter - 5.11.0 + 5.11.1 test