Update latest to 19.0.0.9

build/buildAll.sh

@@ -6,8 +6,8 @@
 
 usage="Usage (all args optional): buildAll.sh --version=<version> --buildLabel=<build label> --communityRepository=<communityRepository> --officialRepository=<officialRepository> --javaee8DownloadUrl=<javaee8 image download url> --runtimeDownloadUrl=<runtime image download url> --webprofile8DownloadUrl=<webprofile8 image download url>"
 
-version=19.0.0.8
-buildLabel=cl190820190813-1136
+version=19.0.0.9
+buildLabel=cl190920190905-0148
 communityRepository=openliberty/open-liberty
 officialRepository=open-liberty
 javaee8DownloadUrl="https://repo1.maven.org/maven2/io/openliberty/openliberty-javaee8/${version}/openliberty-javaee8-${version}.zip"

build/images.txt

@@ -44,6 +44,52 @@
 ../official/latest/webProfile8/java8/openj9      webProfile8-java8-openj9
 ../official/latest/webProfile8/java11/openj9     webProfile8-java11
 ../official/latest/webProfile8/java12/openj9     webProfile8-java12
+../official/19.0.0.9/kernel/java8/ibmjava          19.0.0.9-kernel-java8-ibm           19.0.0.9-kernel
+../official/19.0.0.9/kernel/java8/ibmsfj           19.0.0.9-kernel-java8-ibmsfj
+../official/19.0.0.9/kernel/java8/openj9           19.0.0.9-kernel-java8-openj9
+../official/19.0.0.9/kernel/java11/openj9          19.0.0.9-kernel-java11
+../official/19.0.0.9/kernel/java12/openj9          19.0.0.9-kernel-java12
+../official/19.0.0.9/javaee7/java8/ibmjava         19.0.0.9-javaee7-java8-ibm          19.0.0.9-javaee7
+../official/19.0.0.9/javaee7/java8/ibmsfj          19.0.0.9-javaee7-java8-ibmsfj
+../official/19.0.0.9/javaee7/java8/openj9          19.0.0.9-javaee7-java8-openj9
+../official/19.0.0.9/javaee7/java11/openj9         19.0.0.9-javaee7-java11
+../official/19.0.0.9/javaee8/java8/ibmjava         19.0.0.9-javaee8-java8-ibm          19.0.0.9-javaee8
+../official/19.0.0.9/javaee8/java8/ibmsfj          19.0.0.9-javaee8-java8-ibmsfj
+../official/19.0.0.9/javaee8/java8/openj9          19.0.0.9-javaee8-java8-openj9
+../official/19.0.0.9/javaee8/java11/openj9         19.0.0.9-javaee8-java11
+../official/19.0.0.9/javaee8/java12/openj9         19.0.0.9-javaee8-java12
+../official/19.0.0.9/microProfile1/java8/ibmjava   19.0.0.9-microProfile1-java8-ibm    19.0.0.9-microProfile1
+../official/19.0.0.9/microProfile1/java8/ibmsfj    19.0.0.9-microProfile1-java8-ibmsfj
+../official/19.0.0.9/microProfile1/java8/openj9    19.0.0.9-microProfile1-java8-openj9
+../official/19.0.0.9/microProfile1/java11/openj9   19.0.0.9-microProfile1-java11
+../official/19.0.0.9/microProfile2/java8/ibmjava   19.0.0.9-microProfile2-java8-ibm    19.0.0.9-microProfile2
+../official/19.0.0.9/microProfile2/java8/ibmsfj    19.0.0.9-microProfile2-java8-ibmsfj
+../official/19.0.0.9/microProfile2/java8/openj9    19.0.0.9-microProfile2-java8-openj9
+../official/19.0.0.9/microProfile2/java11/openj9   19.0.0.9-microProfile2-java11
+../official/19.0.0.9/microProfile2/java12/openj9   19.0.0.9-microProfile2-java12
+../official/19.0.0.9/microProfile3/java8/ibmjava   19.0.0.9-microProfile3-java8-ibm    19.0.0.9-microProfile2
+../official/19.0.0.9/microProfile3/java8/ibmsfj    19.0.0.9-microProfile3-java8-ibmsfj
+../official/19.0.0.9/microProfile3/java8/openj9    19.0.0.9-microProfile3-java8-openj9
+../official/19.0.0.9/microProfile3/java11/openj9   19.0.0.9-microProfile3-java11
+../official/19.0.0.9/microProfile3/java12/openj9   19.0.0.9-microProfile3-java12
+../official/19.0.0.9/springBoot1/java8/ibmjava     19.0.0.9-springBoot1-java8-ibm      19.0.0.9-springBoot1
+../official/19.0.0.9/springBoot1/java8/ibmsfj      19.0.0.9-springBoot1-java8-ibmsfj
+../official/19.0.0.9/springBoot1/java8/openj9      19.0.0.9-springBoot1-java8-openj9
+../official/19.0.0.9/springBoot1/java11/openj9     19.0.0.9-springBoot1-java11
+../official/19.0.0.9/springBoot2/java8/ibmjava     19.0.0.9-springBoot2-java8-ibm      19.0.0.9-springBoot2
+../official/19.0.0.9/springBoot2/java8/ibmsfj      19.0.0.9-springBoot2-java8-ibmsfj
+../official/19.0.0.9/springBoot2/java8/openj9      19.0.0.9-springBoot2-java8-openj9
+../official/19.0.0.9/springBoot2/java11/openj9     19.0.0.9-springBoot2-java11
+../official/19.0.0.9/springBoot2/java12/openj9     19.0.0.9-springBoot2-java12
+../official/19.0.0.9/webProfile7/java8/ibmjava     19.0.0.9-webProfile7-java8-ibm      19.0.0.9-webProfile7
+../official/19.0.0.9/webProfile7/java8/ibmsfj      19.0.0.9-webProfile7-java8-ibmsfj
+../official/19.0.0.9/webProfile7/java8/openj9      19.0.0.9-webProfile7-java8-openj9
+../official/19.0.0.9/webProfile7/java11/openj9     19.0.0.9-webProfile7-java11
+../official/19.0.0.9/webProfile8/java8/ibmjava     19.0.0.9-webProfile8-java8-ibm      19.0.0.9-webProfile8
+../official/19.0.0.9/webProfile8/java8/ibmsfj      19.0.0.9-webProfile8-java8-ibmsfj
+../official/19.0.0.9/webProfile8/java8/openj9      19.0.0.9-webProfile8-java8-openj9
+../official/19.0.0.9/webProfile8/java11/openj9     19.0.0.9-webProfile8-java11
+../official/19.0.0.9/webProfile8/java12/openj9     19.0.0.9-webProfile8-java12
 ../official/19.0.0.6/kernel/java8/ibmjava        19.0.0.6-kernel-java8-ibm           19.0.0.6-kernel
 ../official/19.0.0.6/kernel/java8/ibmsfj         19.0.0.6-kernel-java8-ibmsfj
 ../official/19.0.0.6/kernel/java8/openj9         19.0.0.6-kernel-java8-openj9
@@ -80,30 +126,3 @@
 ../official/19.0.0.6/webProfile8/java8/ibmsfj    19.0.0.6-webProfile8-java8-ibmsfj
 ../official/19.0.0.6/webProfile8/java8/openj9    19.0.0.6-webProfile8-java8-openj9
 ../official/19.0.0.6/webProfile8/java11/openj9   19.0.0.6-webProfile8-java11
-../official/19.0.0.3/kernel/java8/ibmjava        19.0.0.3-kernel-java8-ibm           19.0.0.3-kernel
-../official/19.0.0.3/kernel/java8/ibmsfj         19.0.0.3-kernel-java8-ibmsfj
-../official/19.0.0.3/kernel/java8/openj9         19.0.0.3-kernel-java8-openj9
-../official/19.0.0.3/javaee7/java8/ibmjava       19.0.0.3-javaee7-java8-ibm          19.0.0.3-javaee7
-../official/19.0.0.3/javaee7/java8/ibmsfj        19.0.0.3-javaee7-java8-ibmsfj
-../official/19.0.0.3/javaee7/java8/openj9        19.0.0.3-javaee7-java8-openj9
-../official/19.0.0.3/javaee8/java8/ibmjava       19.0.0.3-javaee8-java8-ibm          19.0.0.3-javaee8
-../official/19.0.0.3/javaee8/java8/ibmsfj        19.0.0.3-javaee8-java8-ibmsfj
-../official/19.0.0.3/javaee8/java8/openj9        19.0.0.3-javaee8-java8-openj9
-../official/19.0.0.3/microProfile1/java8/ibmjava 19.0.0.3-microProfile1-java8-ibm    19.0.0.3-microProfile1
-../official/19.0.0.3/microProfile1/java8/ibmsfj  19.0.0.3-microProfile1-java8-ibmsfj
-../official/19.0.0.3/microProfile1/java8/openj9  19.0.0.3-microProfile1-java8-openj9
-../official/19.0.0.3/microProfile2/java8/ibmjava 19.0.0.3-microProfile2-java8-ibm    19.0.0.3-microProfile2
-../official/19.0.0.3/microProfile2/java8/ibmsfj  19.0.0.3-microProfile2-java8-ibmsfj
-../official/19.0.0.3/microProfile2/java8/openj9  19.0.0.3-microProfile2-java8-openj9
-../official/19.0.0.3/springBoot1/java8/ibmjava   19.0.0.3-springBoot1-java8-ibm      19.0.0.3-springBoot1
-../official/19.0.0.3/springBoot1/java8/ibmsfj    19.0.0.3-springBoot1-java8-ibmsfj
-../official/19.0.0.3/springBoot1/java8/openj9    19.0.0.3-springBoot1-java8-openj9
-../official/19.0.0.3/springBoot2/java8/ibmjava   19.0.0.3-springBoot2-java8-ibm      19.0.0.3-springBoot2
-../official/19.0.0.3/springBoot2/java8/ibmsfj    19.0.0.3-springBoot2-java8-ibmsfj
-../official/19.0.0.3/springBoot2/java8/openj9    19.0.0.3-springBoot2-java8-openj9
-../official/19.0.0.3/webProfile7/java8/ibmjava   19.0.0.3-webProfile7-java8-ibm      19.0.0.3-webProfile7
-../official/19.0.0.3/webProfile7/java8/ibmsfj    19.0.0.3-webProfile7-java8-ibmsfj
-../official/19.0.0.3/webProfile7/java8/openj9    19.0.0.3-webProfile7-java8-openj9
-../official/19.0.0.3/webProfile8/java8/ibmjava   19.0.0.3-webProfile8-java8-ibm      19.0.0.3-webProfile8
-../official/19.0.0.3/webProfile8/java8/ibmsfj    19.0.0.3-webProfile8-java8-ibmsfj
-../official/19.0.0.3/webProfile8/java8/openj9    19.0.0.3-webProfile8-java8-openj9

community/19.0.0.6/javaee7/java8/ibmsfj/Dockerfile.ubi-min → community/19.0.0.9/javaee7/java8/ibmsfj/Dockerfile.ubi-min

@@ -1,4 +1,3 @@
-FROM open-liberty:19.0.0.6-kernel-ubi-min
-ENV KEYSTORE_REQUIRED "true"
+FROM open-liberty:19.0.0.9-kernel-ubi-min
 
 RUN cp /opt/ol/wlp/templates/servers/javaee7/server.xml /config/server.xml

community/19.0.0.6/javaee8/java8/ibmsfj/Dockerfile.ubi-min → community/19.0.0.9/javaee8/java8/ibmsfj/Dockerfile.ubi-min

@@ -1,8 +1,8 @@
 
 FROM ibmjava:8-ibmsfj-ubi-min
-ARG LIBERTY_VERSION=19.0.0.6
-ARG LIBERTY_SHA=ba115723986bbf2e83d79262570b1fce82f6aa43
-ARG LIBERTY_BUILD_LABEL=cl190620190617-1530
+ARG LIBERTY_VERSION=19.0.0.9
+ARG LIBERTY_SHA=bfba15b347c89e5b239b6b93aa1fe4cd9039a70f
+ARG LIBERTY_BUILD_LABEL=cl190920190905-0148
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-javaee8/$LIBERTY_VERSION/openliberty-javaee8-$LIBERTY_VERSION.zip
 
 LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter" \
@@ -75,7 +75,5 @@ USER 1001
 
 EXPOSE 9080 9443
 
-ENV KEYSTORE_REQUIRED true
-
 ENTRYPOINT ["/opt/ol/helpers/runtime/docker-server.sh"]
 CMD ["/opt/ol/wlp/bin/server", "run", "defaultServer"]

community/19.0.0.9/javaee8/java8/ibmsfj/helpers/build/configuration_snippets/keystore.xml

@@ -0,0 +1,3 @@
+<server description="Default Server">
+    <keyStore id="defaultKeyStore" password="REPLACE" />
+</server>

community/19.0.0.9/javaee8/java8/ibmsfj/helpers/build/configuration_snippets/tls.xml

@@ -0,0 +1,5 @@
+<server description="Default Server">
+    <featureManager>
+        <feature>transportSecurity-1.0</feature>
+    </featureManager>
+</server>

community/19.0.0.6/webProfile8/java8/ibmsfj/helpers/build/configure.sh → community/19.0.0.9/javaee8/java8/ibmsfj/helpers/build/configure.sh

@@ -8,6 +8,7 @@ SHARED_RESOURCE_DIR=${WLP_INSTALL_DIR}/usr/shared/resources
 
 SNIPPETS_SOURCE=/opt/ol/helpers/build/configuration_snippets
 SNIPPETS_TARGET=/config/configDropins/overrides
+SNIPPETS_TARGET_DEFAULTS=/config/configDropins/defaults
 mkdir -p ${SNIPPETS_TARGET}
 
 
@@ -23,14 +24,9 @@ if [ "$MP_MONITORING" == "true" ]; then
   cp $SNIPPETS_SOURCE/mp-monitoring.xml $SNIPPETS_TARGET/mp-monitoring.xml
 fi
 
-# SSL
-if [ "$SSL" == "true" ]; then
-  cp $SNIPPETS_SOURCE/ssl.xml $SNIPPETS_TARGET/ssl.xml
-fi
-
 # HTTP Endpoint
 if [ "$HTTP_ENDPOINT" == "true" ]; then
-  if [ "$SSL" == "true" ]; then
+  if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then
     cp $SNIPPETS_SOURCE/http-ssl-endpoint.xml $SNIPPETS_TARGET/http-ssl-endpoint.xml
   else
     cp $SNIPPETS_SOURCE/http-endpoint.xml $SNIPPETS_TARGET/http-endpoint.xml
@@ -47,7 +43,7 @@ fi
 
 # IIOP Endpoint
 if [ "$IIOP_ENDPOINT" == "true" ]; then
-  if [ "$SSL" == "true" ]; then
+  if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then
     cp $SNIPPETS_SOURCE/iiop-ssl-endpoint.xml $SNIPPETS_TARGET/iiop-ssl-endpoint.xml
   else
     cp $SNIPPETS_SOURCE/iiop-endpoint.xml $SNIPPETS_TARGET/iiop-endpoint.xml
@@ -56,11 +52,30 @@ fi
 
 # JMS Endpoint
 if [ "$JMS_ENDPOINT" == "true" ]; then
-  if [ "$SSL" == "true" ]; then
+  if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]; then
     cp $SNIPPETS_SOURCE/jms-ssl-endpoint.xml $SNIPPETS_TARGET/jms-ssl-endpoint.xml
   else
     cp $SNIPPETS_SOURCE/jms-endpoint.xml $SNIPPETS_TARGET/jms-endpoint.xml
   fi
 fi
+
+# Key Store
+keystorePath="$SNIPPETS_TARGET_DEFAULTS/keystore.xml"
+if [ "$SSL" == "true" ] || [ "$TLS" == "true" ]
+then
+  cp $SNIPPETS_SOURCE/tls.xml $SNIPPETS_TARGET/tls.xml
+fi
+
+if [ "$SSL" != "false" ] && [ "$TLS" != "false" ]
+then
+  if [ ! -e $keystorePath ]
+  then
+    # Generate the keystore.xml
+    export KEYSTOREPWD=$(openssl rand -base64 32)
+    sed -i.bak "s|REPLACE|$KEYSTOREPWD|g" $SNIPPETS_SOURCE/keystore.xml
+    cp $SNIPPETS_SOURCE/keystore.xml $SNIPPETS_TARGET_DEFAULTS/keystore.xml
+  fi
+fi
+
 # Server start/stop to populate the /output/workarea and make subsequent server starts faster
-/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/resources/security/ /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*
+/opt/ol/wlp/bin/server start && /opt/ol/wlp/bin/server stop && rm -rf /output/messaging /logs/* $WLP_OUTPUT_DIR/.classCache && chmod -R g+rwx /opt/ol/wlp/output/*

community/19.0.0.9/javaee8/java8/ibmsfj/helpers/runtime/docker-server.sh

@@ -0,0 +1,29 @@
+#!/bin/sh
+
+set -e
+
+SNIPPETS_SOURCE=/opt/ol/helpers/build/configuration_snippets
+SNIPPETS_TARGET_DEFAULTS=/config/configDropins/defaults
+SNIPPETS_TARGET_OVERRIDES=/config/configDropins/overrides
+
+keystorePath="$SNIPPETS_TARGET_DEFAULTS/keystore.xml"
+
+if [ "$SSL" = "true" ] || [ "$TLS" = "true" ]
+then
+  cp $SNIPPETS_SOURCE/tls.xml $SNIPPETS_TARGET_OVERRIDES/tls.xml
+fi
+
+if [ "$SSL" != "false" ] && [ "$TLS" != "false" ]
+then
+  if [ ! -e $keystorePath ]
+  then
+    # Generate the keystore.xml
+    export KEYSTOREPWD=$(openssl rand -base64 32)
+    sed -i.bak "s|REPLACE|$KEYSTOREPWD|g" $SNIPPETS_SOURCE/keystore.xml
+    cp $SNIPPETS_SOURCE/keystore.xml $SNIPPETS_TARGET_DEFAULTS/keystore.xml
+  fi
+fi
+
+
+# Pass on to the real server run
+exec "$@"

community/19.0.0.6/kernel/java8/ibmsfj/Dockerfile.ubi-min → community/19.0.0.9/kernel/java8/ibmsfj/Dockerfile.ubi-min

@@ -1,7 +1,7 @@
 FROM ibmjava:8-ibmsfj-ubi-min
-ARG LIBERTY_VERSION=19.0.0.6
-ARG LIBERTY_SHA=4e97ebc8a94c75dead89282c04f78cac3c8e0ba4
-ARG LIBERTY_BUILD_LABEL=cl190620190617-1530
+ARG LIBERTY_VERSION=19.0.0.9
+ARG LIBERTY_SHA=f05e1f6f738d33a8fd93e356de12413fc0e271a5
+ARG LIBERTY_BUILD_LABEL=cl190920190905-0148
 ARG LIBERTY_DOWNLOAD_URL=https://repo1.maven.org/maven2/io/openliberty/openliberty-runtime/$LIBERTY_VERSION/openliberty-runtime-$LIBERTY_VERSION.zip
 
 LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter" \
@@ -78,7 +78,5 @@ USER 1001
 
 EXPOSE 9080 9443
 
-ENV KEYSTORE_REQUIRED true
-
 ENTRYPOINT ["/opt/ol/helpers/runtime/docker-server.sh"]
 CMD ["/opt/ol/wlp/bin/server", "run", "defaultServer"]

community/19.0.0.9/kernel/java8/ibmsfj/helpers/build/configuration_snippets/keystore.xml

@@ -0,0 +1,3 @@
+<server description="Default Server">
+    <keyStore id="defaultKeyStore" password="REPLACE" />
+</server>

community/19.0.0.9/kernel/java8/ibmsfj/helpers/build/configuration_snippets/tls.xml

@@ -0,0 +1,5 @@
+<server description="Default Server">
+    <featureManager>
+        <feature>transportSecurity-1.0</feature>
+    </featureManager>
+</server>