Change to use kernel-slim image (#240)

gkwan-ibm · Saumya-Pandya · web-flow · commit e0bc63fa5bc5 · 2023-07-07T14:08:37.000-04:00
* Change to use kernel-slim image

* Update testApp.sh

* Update testAppSN.sh

* updated dockerImage to kernel slim

* updated liberty-mvn-plugin version

---------

Co-authored-by: Saumya-Pandya &lt;Saumya.Pandya@ibm.com&gt;
diff --git a/README.adoc b/README.adoc
@@ -1,7 +1,7 @@
 // INSTRUCTION: Please remove all comments that start INSTRUCTION prior to commit. Most comments should be removed, although not the copyright.
 // INSTRUCTION: The copyright statement must appear at the top of the file
 //
-// Copyright (c) 2018, 2022 IBM Corporation and others.
+// Copyright (c) 2018, 2023 IBM Corporation and others.
 // Licensed under Creative Commons Attribution-NoDerivatives
 // 4.0 International (CC BY-ND 4.0)
 //   https://creativecommons.org/licenses/by-nd/4.0/
@@ -116,7 +116,7 @@ cd start
 mvn clean package
 ```
 
-include::{common-includes}/ol-icr-full-docker-pull.adoc[]
+
 
 Next, run the `docker build` commands to build container images for your application:
 [role='command']
@@ -146,7 +146,7 @@ include::{common-includes}/os-tabs.adoc[]
 REPOSITORY                                                       TAG
 inventory                                                        1.0-SNAPSHOT
 system                                                           1.0-SNAPSHOT
-openliberty/open-liberty                                         full-java11-openj9-ubi
+openliberty/open-liberty                                         kernel-slim-java11-openj9-ubi
 k8s.gcr.io/kube-proxy-amd64                                      v1.10.3
 k8s.gcr.io/kube-scheduler-amd64                                  v1.10.3
 k8s.gcr.io/kube-controller-manager-amd64                         v1.10.3
@@ -166,7 +166,7 @@ k8s.gcr.io/pause-amd64                                           3.1
 REPOSITORY                                                       TAG
 inventory                                                        1.0-SNAPSHOT
 system                                                           1.0-SNAPSHOT
-openliberty/open-liberty                                         full-java11-openj9-ubi
+openliberty/open-liberty                                         kernel-slim-java11-openj9-ubi
 k8s.gcr.io/kube-proxy-amd64                                      v1.10.0
 k8s.gcr.io/kube-controller-manager-amd64                         v1.10.0
 k8s.gcr.io/kube-apiserver-amd64                                  v1.10.0
@@ -202,7 +202,7 @@ Verify that the ***system:1.0-SNAPSHOT*** and ***inventory:1.0-SNAPSHOT*** image
 REPOSITORY                                TAG                       
 inventory                                 1.0-SNAPSHOT
 system                                    1.0-SNAPSHOT
-openliberty/open-liberty                  full-java11-openj9-ubi
+openliberty/open-liberty                  kernel-slim-java11-openj9-ubi
 ```
 
 If you don't see the ***system:1.0-SNAPSHOT*** and ***inventory:1.0-SNAPSHOT*** images, then check the Maven build log for any potential errors. If the images built without errors, push them to your container registry on IBM Cloud with the following commands:
diff --git a/finish/inventory/Dockerfile b/finish/inventory/Dockerfile
@@ -1,5 +1,6 @@
-FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi
+FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
 
 COPY --chown=1001:0 src/main/liberty/config /config/
+RUN features.sh
 COPY --chown=1001:0 target/guide-kubernetes-intro-inventory.war /config/apps
 RUN configure.sh
diff --git a/finish/inventory/pom.xml b/finish/inventory/pom.xml
@@ -90,7 +90,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.7.1</version>
+                <version>3.8.2</version>
             </plugin>
             <!-- Plugin to run unit tests -->
             <plugin>
diff --git a/finish/system/Dockerfile b/finish/system/Dockerfile
@@ -1,5 +1,6 @@
-FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi
+FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
 
 COPY --chown=1001:0 src/main/liberty/config /config/
+RUN features.sh
 COPY --chown=1001:0 target/guide-kubernetes-intro-system.war /config/apps
 RUN configure.sh
diff --git a/finish/system/pom.xml b/finish/system/pom.xml
@@ -71,7 +71,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.7.1</version>
+                <version>3.8.2</version>
             </plugin>
             <!-- Plugin to run unit tests -->
             <plugin>
diff --git a/scripts/dailyBuild.sh b/scripts/dailyBuild.sh
@@ -16,7 +16,7 @@ sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#a<configuration><install
 cat system/pom.xml
 cat inventory/pom.xml
 
-sed -i "s;FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" system/Dockerfile inventory/Dockerfile
+sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" system/Dockerfile inventory/Dockerfile
 cat system/Dockerfile
 cat inventory/Dockerfile
 
diff --git a/scripts/dockerImageTest.sh b/scripts/dockerImageTest.sh
@@ -13,7 +13,7 @@ echo "Testing latest OpenLiberty Docker image"
 sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#a<configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER</runtimeUrl></install></configuration>" system/pom.xml inventory/pom.xml
 cat system/pom.xml inventory/pom.xml
 
-sed -i "s;FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi;FROM openliberty/daily:latest;g" system/Dockerfile inventory/Dockerfile
+sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi;FROM openliberty/daily:latest;g" system/Dockerfile inventory/Dockerfile
 cat system/Dockerfile inventory/Dockerfile
 
 docker pull -q "openliberty/daily:latest"
diff --git a/scripts/testApp.sh b/scripts/testApp.sh
@@ -14,7 +14,7 @@ mvn -ntp -Dhttp.keepAlive=false \
     -Dmaven.wagon.httpconnectionManager.ttlSeconds=120 \
     -q clean package
 
-docker pull -q icr.io/appcafe/open-liberty:full-java11-openj9-ubi
+docker pull -q icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
 
 docker build -t system:1.0-SNAPSHOT system/.
 docker build -t inventory:1.0-SNAPSHOT inventory/.
diff --git a/scripts/testAppSN.sh b/scripts/testAppSN.sh
@@ -3,7 +3,7 @@ set -euxo pipefail
 
 mvn -q package
 
-docker pull icr.io/appcafe/open-liberty:full-java11-openj9-ubi
+docker pull icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
 
 docker build -t system:1.0-SNAPSHOT system/.
 docker build -t inventory:1.0-SNAPSHOT inventory/.
diff --git a/start/inventory/Dockerfile b/start/inventory/Dockerfile
@@ -1,5 +1,6 @@
-FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi
+FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
 
 COPY --chown=1001:0 src/main/liberty/config /config/
+RUN features.sh
 COPY --chown=1001:0 target/guide-kubernetes-intro-inventory.war /config/apps
 RUN configure.sh
diff --git a/start/inventory/pom.xml b/start/inventory/pom.xml
@@ -85,7 +85,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.7.1</version>
+                <version>3.8.2</version>
             </plugin>
              <!-- Plugin to run unit tests -->
             <plugin>
diff --git a/start/system/Dockerfile b/start/system/Dockerfile
@@ -1,5 +1,6 @@
-FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi
+FROM icr.io/appcafe/open-liberty:kernel-slim-java11-openj9-ubi
 
 COPY --chown=1001:0 src/main/liberty/config /config/
+RUN features.sh
 COPY --chown=1001:0 target/guide-kubernetes-intro-system.war /config/apps
 RUN configure.sh
diff --git a/start/system/pom.xml b/start/system/pom.xml
@@ -71,7 +71,7 @@
             <plugin>
                 <groupId>io.openliberty.tools</groupId>
                 <artifactId>liberty-maven-plugin</artifactId>
-                <version>3.7.1</version>
+                <version>3.8.2</version>
             </plugin>
             <!-- Plugin to run unit tests -->
             <plugin>
