Update 22.0.0.8

Author: kabicin

releases/22.0.0.8/full/Dockerfile.ubi.ibmjava8

@@ -108,7 +108,7 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
 
 # These settings are needed so that we can run as a different user than 1001 after server warmup
 ENV RANDFILE=/tmp/.rnd \
-    IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,readonly,nonfatal,cacheDir=$WLP_OUTPUT_DIR/.classCache/ -Dosgi.checkConfiguration=false ${IBM_JAVA_OPTIONS}"
+    IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,readonly,nonfatal,cacheDir=/output/.classCache/ -Dosgi.checkConfiguration=false ${IBM_JAVA_OPTIONS}"
 
 USER 1001
 

releases/22.0.0.8/full/helpers/build/populate_scc.sh

@@ -15,7 +15,7 @@ if [[ -d "/opt/java/.scc" ]] && [[ `stat -L -c "%a" "/opt/java/.scc" | cut -c 1,
 then
   SCC="-Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc"
 else
-  SCC="-Xshareclasses:name=liberty,cacheDir=${WLP_OUTPUT_DIR}/.classCache"
+  SCC="-Xshareclasses:name=liberty,cacheDir=/output/.classCache"
 fi
 
 # For JDK8, as of OpenJ9 0.20.0 the criteria for determining the max heap size (-Xmx) has changed

releases/22.0.0.8/full/helpers/runtime/configure-liberty.sh

@@ -23,9 +23,6 @@ if [ "$SERVER_NAME" != "defaultServer" ] && [ -d "/opt/ol/wlp/usr/servers/defaul
   rm /opt/ol/links/output
   rm /opt/ol/links/config
 
-  # Delete old output folder
-  rm -rf /opt/ol/wlp/output/defaultServer
-  
   # Add new output folder symlink and resolve group write permissions
   mkdir -p $WLP_OUTPUT_DIR/$SERVER_NAME
   ln -s $WLP_OUTPUT_DIR/$SERVER_NAME /opt/ol/links/output
@@ -36,6 +33,12 @@ if [ "$SERVER_NAME" != "defaultServer" ] && [ -d "/opt/ol/wlp/usr/servers/defaul
   chmod -R g+w $WLP_OUTPUT_DIR/$SERVER_NAME/workarea
   chmod -R g+w,o-rwx $WLP_OUTPUT_DIR/$SERVER_NAME/resources
   chmod -R g+w,o-rwx $WLP_OUTPUT_DIR/$SERVER_NAME/logs
+  
+  # Hand over the SCC
+  if [ "$OPENJ9_SCC" = "true" ] && [ -d "/opt/ol/wlp/output/defaultServer/.classCache" ]; then
+    mv /opt/ol/wlp/output/defaultServer/.classCache $WLP_OUTPUT_DIR/$SERVER_NAME/
+  fi
+  rm -rf /opt/ol/wlp/output/defaultServer
 
   # Add new server symlink and populate folder
   ln -s /opt/ol/wlp/usr/servers/$SERVER_NAME /opt/ol/links/config

releases/22.0.0.8/kernel-slim/Dockerfile.ubi.ibmjava8

@@ -107,7 +107,7 @@ RUN if [ "$OPENJ9_SCC" = "true" ]; then populate_scc.sh; fi \
 
 # These settings are needed so that we can run as a different user than 1001 after server warmup
 ENV RANDFILE=/tmp/.rnd \
-    IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,readonly,nonfatal,cacheDir=$WLP_OUTPUT_DIR/.classCache/ -Dosgi.checkConfiguration=false ${IBM_JAVA_OPTIONS}"
+    IBM_JAVA_OPTIONS="-Xshareclasses:name=liberty,readonly,nonfatal,cacheDir=/output/.classCache/ -Dosgi.checkConfiguration=false ${IBM_JAVA_OPTIONS}"
 
 USER 1001
 

releases/22.0.0.8/kernel-slim/helpers/build/features.sh

@@ -8,6 +8,9 @@ set -Eeox pipefail
 
 # Resolve liberty server symlinks and creation for server name changes
 /opt/ol/helpers/runtime/configure-liberty.sh
+if [ $? -ne 0 ]; then
+  exit
+fi
 
 ##Define variables for XML snippets source and target paths
 SNIPPETS_SOURCE=/opt/ol/helpers/build/configuration_snippets

releases/22.0.0.8/kernel-slim/helpers/build/populate_scc.sh

@@ -15,7 +15,7 @@ if [[ -d "/opt/java/.scc" ]] && [[ `stat -L -c "%a" "/opt/java/.scc" | cut -c 1,
 then
   SCC="-Xshareclasses:name=openj9_system_scc,cacheDir=/opt/java/.scc"
 else
-  SCC="-Xshareclasses:name=liberty,cacheDir=${WLP_OUTPUT_DIR}/.classCache"
+  SCC="-Xshareclasses:name=liberty,cacheDir=/output/.classCache"
 fi
 
 # For JDK8, as of OpenJ9 0.20.0 the criteria for determining the max heap size (-Xmx) has changed

releases/22.0.0.8/kernel-slim/helpers/runtime/configure-liberty.sh

@@ -3,7 +3,7 @@
 # If the Liberty server name is not defaultServer and defaultServer still exists migrate the contents
 if [ "$SERVER_NAME" != "defaultServer" ] && [ -d "/opt/ol/wlp/usr/servers/defaultServer" ]; then
   # Create new Liberty server
-  /opt/ol/wlp/bin/server create --template=javaee8 >/tmp/serverOutput 
+  /opt/ol/wlp/bin/server create >/tmp/serverOutput 
   rc=$?
   if [ $rc -ne 0 ]; then
     cat /tmp/serverOutput
@@ -23,9 +23,6 @@ if [ "$SERVER_NAME" != "defaultServer" ] && [ -d "/opt/ol/wlp/usr/servers/defaul
   rm /opt/ol/links/output
   rm /opt/ol/links/config
 
-  # Delete old output folder
-  rm -rf /opt/ol/wlp/output/defaultServer
-  
   # Add new output folder symlink and resolve group write permissions
   mkdir -p $WLP_OUTPUT_DIR/$SERVER_NAME
   ln -s $WLP_OUTPUT_DIR/$SERVER_NAME /opt/ol/links/output
@@ -36,6 +33,12 @@ if [ "$SERVER_NAME" != "defaultServer" ] && [ -d "/opt/ol/wlp/usr/servers/defaul
   chmod -R g+w $WLP_OUTPUT_DIR/$SERVER_NAME/workarea
   chmod -R g+w,o-rwx $WLP_OUTPUT_DIR/$SERVER_NAME/resources
   chmod -R g+w,o-rwx $WLP_OUTPUT_DIR/$SERVER_NAME/logs
+  
+  # Hand over the SCC
+  if [ "$OPENJ9_SCC" = "true" ] && [ -d "/opt/ol/wlp/output/defaultServer/.classCache" ]; then
+    mv /opt/ol/wlp/output/defaultServer/.classCache $WLP_OUTPUT_DIR/$SERVER_NAME/
+  fi
+  rm -rf /opt/ol/wlp/output/defaultServer
 
   # Add new server symlink and populate folder
   ln -s /opt/ol/wlp/usr/servers/$SERVER_NAME /opt/ol/links/config