Merge pull request #27 from OpenLiberty/staging

Merge staging to prod - Updated containerfiles (#24)

Author: gkwan-ibm

.github/workflows/test.yml

@@ -52,15 +52,15 @@ jobs:
     - run: unset _JAVA_OPTIONS
     - name: Run tests
       run: |
-          sudo ../scripts/testAppFinish.sh
-          sudo ../scripts/testAppStart.sh
+          ../scripts/testAppFinish.sh
+          ../scripts/testAppStart.sh
     - name: Post tests
       if: always()
       run: | 
-          sudo podman images
+          podman images
           cd ../start
-          logsPath=$(sudo find . -name "console.log" | grep inventory);
-          sudo cat $logsPath | sudo grep Launching
+          logsPath=$(find . -name "console.log" | grep inventory);
+          cat $logsPath | grep Launching
     - name: Archive server logs if failed
       if: failure()
       uses: actions/upload-artifact@v2

finish/inventory/Containerfile

@@ -10,13 +10,13 @@ LABEL \
   org.opencontainers.image.authors="Your Name" \
   org.opencontainers.image.vendor="Open Liberty" \
   org.opencontainers.image.url="local" \
-  org.opencontainers.image.source="https://github.com/OpenLiberty/guide-containerize" \
+  org.opencontainers.image.source="https://github.com/OpenLiberty/guide-containerize-podman" \
   org.opencontainers.image.version="$VERSION" \
   org.opencontainers.image.revision="$REVISION" \
   vendor="Open Liberty" \
   name="inventory" \
   version="$VERSION-$REVISION" \
-  summary="The inventory microservice from the Containerizing microservices guide" \
+  summary="The inventory microservice from the Containerizing microservices with Podman guide" \
   description="This image contains the inventory microservice running with the Open Liberty runtime."
 # end::label[]
 

finish/inventory/Containerfile-full

@@ -10,13 +10,13 @@ LABEL \
   org.opencontainers.image.authors="Your Name" \
   org.opencontainers.image.vendor="Open Liberty" \
   org.opencontainers.image.url="local" \
-  org.opencontainers.image.source="https://github.com/OpenLiberty/guide-containerize" \
+  org.opencontainers.image.source="https://github.com/OpenLiberty/guide-containerize-podman" \
   org.opencontainers.image.version="$VERSION" \
   org.opencontainers.image.revision="$REVISION" \
   vendor="Open Liberty" \
   name="inventory" \
   version="$VERSION-$REVISION" \
-  summary="The inventory microservice from the Containerizing microservices guide" \
+  summary="The inventory microservice from the Containerizing microservices with Podman guide" \
   description="This image contains the inventory microservice running with the Open Liberty runtime."
 # end::label[]
 

finish/system/Containerfile

@@ -9,7 +9,7 @@ LABEL \
   org.opencontainers.image.authors="Your Name" \
   org.opencontainers.image.vendor="Open Liberty" \
   org.opencontainers.image.url="local" \
-  org.opencontainers.image.source="https://github.com/OpenLiberty/guide-containerize" \
+  org.opencontainers.image.source="https://github.com/OpenLiberty/guide-containerize-podman" \
   org.opencontainers.image.version="$VERSION" \
   org.opencontainers.image.revision="$REVISION" \
   vendor="Open Liberty" \
@@ -18,7 +18,7 @@ LABEL \
 # end::name[]
   version="$VERSION-$REVISION" \
 # tag::summary[]
-  summary="The system microservice from the Containerizing microservices guide" \
+  summary="The system microservice from the Containerizing microservices with Podman guide" \
   description="This image contains the system microservice running with the Open Liberty runtime."
 # end::summary[]
 

finish/system/Containerfile-full

@@ -7,7 +7,7 @@ LABEL \
   org.opencontainers.image.authors="Your Name" \
   org.opencontainers.image.vendor="Open Liberty" \
   org.opencontainers.image.url="local" \
-  org.opencontainers.image.source="https://github.com/OpenLiberty/guide-containerize" \
+  org.opencontainers.image.source="https://github.com/OpenLiberty/guide-containerize-podman" \
   org.opencontainers.image.version="$VERSION" \
   org.opencontainers.image.revision="$REVISION" \
   vendor="Open Liberty" \
@@ -16,7 +16,7 @@ LABEL \
 # end::name[]
   version="$VERSION-$REVISION" \
 # tag::summary[]
-  summary="The system microservice from the Containerizing microservices guide" \
+  summary="The system microservice from the Containerizing microservices with Podman guide" \
   description="This image contains the system microservice running with the Open Liberty runtime."
 # end::summary[]
 

scripts/testAppFinish.sh

@@ -14,7 +14,6 @@ mvn -Dhttp.keepAlive=false \
     -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
     -q clean package
 
-podman pull openliberty/open-liberty:kernel-java8-openj9-ubi
 podman pull icr.io/appcafe/open-liberty:full-java11-openj9-ubi
 podman pull icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi