Skip to content

Commit 99c97c7

Browse files
SiaaG-devSiaaG-dev
committed
fixed github test failure issue
Signed-off-by: Siaa Gor <[email protected]>
1 parent 3cba6e6 commit 99c97c7

File tree

7 files changed

+12
-12
lines changed

7 files changed

+12
-12
lines changed

‎finish/inventory/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
1+
FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi
22

33
ARG VERSION=1.0
44
ARG REVISION=SNAPSHOT

‎finish/system/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
1+
FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi
22

33
ARG VERSION=1.0
44
ARG REVISION=SNAPSHOT

‎scripts/dailyBuild.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#a<configuration><install
1515
cat inventory/pom.xml system/pom.xml
1616

1717
if [[ "$DOCKER_USERNAME" != "" ]]; then
18-
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" inventory/Dockerfile system/Dockerfile
18+
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" inventory/Dockerfile system/Dockerfile
1919
sed -i "s;RUN features.sh;#RUN features.sh;g" inventory/Dockerfile system/Dockerfile
2020
cat inventory/Dockerfile system/Dockerfile
2121
fi

‎scripts/dockerImageTest.sh‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,20 +14,20 @@ sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#a<configuration><install
1414
cat inventory/pom.xml system/pom.xml
1515

1616
if [[ "$OL_LEVEL" != "" ]]; then
17-
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
17+
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java17-openj9-ubi;g" system/Dockerfile inventory/Dockerfile
1818
else
19-
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
19+
sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi;FROM cp.stg.icr.io/cp/olc/open-liberty-daily:full-java17-openj9-ubi;g" system/Dockerfile inventory/Dockerfile
2020
fi
2121
sed -i "s;RUN features.sh;#RUN features.sh;g" inventory/Dockerfile system/Dockerfile
2222
cat inventory/Dockerfile system/Dockerfile
2323

2424
echo "$DOCKER_PASSWORD" | sudo -u runner docker login -u "$DOCKER_USERNAME" --password-stdin cp.stg.icr.io
2525
if [[ "$OL_LEVEL" != "" ]]; then
26-
sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java11-openj9-ubi"
27-
sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java11-openj9-ubi"
26+
sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java17-openj9-ubi"
27+
sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-vnext:$OL_LEVEL-full-java17-openj9-ubi"
2828
else
29-
sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi"
30-
sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java11-openj9-ubi"
29+
sudo -u runner docker pull -q "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java17-openj9-ubi"
30+
sudo -u runner echo "build level:"; docker inspect --format "{{ index .Config.Labels \"org.opencontainers.image.revision\"}}" "cp.stg.icr.io/cp/olc/open-liberty-daily:full-java17-openj9-ubi"
3131
fi
3232

3333
sudo -u runner ../scripts/testApp.sh

‎scripts/testApp.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ eval "$(minikube docker-env)"
2323
-Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
2424
-q package
2525

26-
docker pull -q icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
26+
docker pull -q icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi
2727

2828
docker build -t system:1.0-SNAPSHOT system/.
2929
docker build -t inventory:1.0-SNAPSHOT inventory/.

‎start/inventory/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
1+
FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi
22

33
ARG VERSION=1.0
44
ARG REVISION=SNAPSHOT

‎start/system/Dockerfile‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
1+
FROM icr.io/appcafe/open-liberty:kernel-slim-java17-openj9-ubi
22

33
ARG VERSION=1.0
44
ARG REVISION=SNAPSHOT

0 commit comments

Comments
 (0)