Merge pull request #131 from OpenLiberty/staging

Merge staging to prod - Change to use kernel-slim image

Author: gkwan-ibm

Diff for: README.adoc

@@ -130,7 +130,7 @@ and then uses the Open Liberty [hotspot=springBootUtility]`springBootUtility` co
 
 The second stage begins with the [hotspot=OLimage2 file=0]`Open Liberty Docker image`. The Dockerfile copies the [hotspot=serverXml file=0]`server.xml` file from the `/opt/ol/wlp/templates` directory, which enables Spring Boot and TLS support. Then, the Dockerfile copies the Spring Boot dependent library JAR files that are at the [hotspot=libcache file=0]`lib.index.cache` directory and the [hotspot=thinjar file=0]`thin-guide-spring-boot-0.1.0.jar` file. The `lib.index.cache` directory and the `thin-guide-spring-boot-0.1.0.jar` file were both generated in the first stage.
 
-include::{common-includes}/ol-icr-full-docker-pull.adoc[]
+
 
 Use the following command to build the Docker image:
 [role='command']
@@ -149,7 +149,7 @@ Your `springboot` image appears in the list of Docker images:
 [role='no_copy']
 ```
 REPOSITORY    TAG       IMAGE ID         CREATED           SIZE
-springboot    latest    d3ffdaa81854     27 seconds ago    486MB
+springboot    latest    d3ffdaa81854     27 seconds ago    596MB
 ```
 
 Now, you can run the Spring Boot application in a Docker container:
@@ -281,6 +281,12 @@ mvnw.cmd liberty:run
 ```
 --
 
+After you see the following message, your application server is ready:
+[role="no_copy"]
+----
+The defaultServer server is ready to run a smarter planet.
+----
+
 // Static guide instruction
 ifndef::cloud-hosted[]
 Go to the http://localhost:9080/hello[^] URL to access the application.
@@ -367,6 +373,13 @@ Run the repackaged Spring Boot application. This JAR file was defined previously
 java -jar target/GSSpringBootApp.jar
 ```
 
+After you see the following message, your application server is ready:
+
+[role="no_copy"]
+----
+The defaultServer server is ready to run a smarter planet.
+----
+
 // Static guide instruction
 ifndef::cloud-hosted[]
 Go to the http://localhost:9080/hello[^] URL to access the application.

Diff for: finish/Dockerfile

@@ -1,6 +1,6 @@
 # Stage and thin the application 
 # tag::OLimage1[]
-FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi as staging
+FROM icr.io/appcafe/open-liberty:full-java8-openj9-ubi as staging
 # end::OLimage1[]
 
 # tag::copyJar[]
@@ -17,7 +17,7 @@ RUN springBootUtility thin \
 
 # Build the image
 # tag::OLimage2[]
-FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi
+FROM icr.io/appcafe/open-liberty:kernel-slim-java8-openj9-ubi
 # end::OLimage2[]
 
 ARG VERSION=1.0
@@ -40,6 +40,8 @@ LABEL \
 RUN cp /opt/ol/wlp/templates/servers/springBoot2/server.xml /config/server.xml
 # end::serverXml[]
 
+RUN features.sh
+
 # tag::libcache[]
 COPY --chown=1001:0 --from=staging /staging/lib.index.cache /lib.index.cache
 # end::libcache[]

Diff for: finish/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>
         <configuration>
           <!-- tag::appsDirectory[] -->
           <appsDirectory>apps</appsDirectory>

Diff for: scripts/dailyBuild.sh

@@ -14,7 +14,8 @@ echo "Testing daily build image"
 sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#,\#<configuration>#c<artifactId>liberty-maven-plugin</artifactId><version>3.5.1</version><configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/$DATE/$DRIVER</runtimeUrl></install>" pom.xml
 cat pom.xml
 
-sed -i "s;FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" Dockerfile
+sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java8-openj9-ubi;FROM $DOCKER_USERNAME/olguides:$BUILD;g" Dockerfile
+sed -i "s;RUN features.sh;#RUN features.sh;g" Dockerfile
 cat Dockerfile
 
 sudo ../scripts/testApp.sh

Diff for: scripts/dockerImageTest.sh

@@ -12,7 +12,8 @@ echo "Testing latest OpenLiberty Docker image"
 sed -i "\#<artifactId>liberty-maven-plugin</artifactId>#,\#<configuration>#c<artifactId>liberty-maven-plugin</artifactId><version>3.2.3</version><configuration><install><runtimeUrl>https://public.dhe.ibm.com/ibmdl/export/pub/software/openliberty/runtime/nightly/""$DATE""/""$DRIVER""</runtimeUrl></install>" pom.xml
 cat pom.xml
 
-sed -i "s;FROM icr.io/appcafe/open-liberty:full-java11-openj9-ubi;FROM openliberty/daily:latest;g" Dockerfile
+sed -i "s;FROM icr.io/appcafe/open-liberty:kernel-slim-java8-openj9-ubi;FROM openliberty/daily:latest;g" Dockerfile
+sed -i "s;RUN features.sh;#RUN features.sh;g" Dockerfile
 cat Dockerfile
 
 docker pull -q "openliberty/daily:latest"

Diff for: scripts/testApp.sh

@@ -12,7 +12,7 @@ set -euxo pipefail
       -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-java8-openj9-ubi
 
 docker build -t springboot .
 docker run -d --name springBootContainer -p 9080:9080 -p 9443:9443 springboot