Transfer /config folder contents for custom server configuration in Dockerfile, update petclinic example

Author: kabicin

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

@@ -41,6 +41,7 @@ if [ "$SERVER_NAME" != "defaultServer" ] && [ -d "/opt/ol/wlp/usr/servers/defaul
   rm -rf /opt/ol/wlp/output/defaultServer
 
   # Add new server symlink and populate folder
+  mv /opt/ol/wlp/usr/servers/defaultServer/* /opt/ol/wlp/usr/servers/$SERVER_NAME/
   ln -s /opt/ol/wlp/usr/servers/$SERVER_NAME /opt/ol/links/config
   mkdir -p /config/configDropins/defaults
   mkdir -p /config/configDropins/overrides

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

@@ -41,6 +41,7 @@ if [ "$SERVER_NAME" != "defaultServer" ] && [ -d "/opt/ol/wlp/usr/servers/defaul
   rm -rf /opt/ol/wlp/output/defaultServer
 
   # Add new server symlink and populate folder
+  mv /opt/ol/wlp/usr/servers/defaultServer/* /opt/ol/wlp/usr/servers/$SERVER_NAME/
   ln -s /opt/ol/wlp/usr/servers/$SERVER_NAME /opt/ol/links/config
   mkdir -p /config/configDropins/defaults
   mkdir -p /config/configDropins/overrides

releases/latest/beta/helpers/runtime/configure-liberty.sh

@@ -41,6 +41,7 @@ if [ "$SERVER_NAME" != "defaultServer" ] && [ -d "/opt/ol/wlp/usr/servers/defaul
   rm -rf /opt/ol/wlp/output/defaultServer
 
   # Add new server symlink and populate folder
+  mv /opt/ol/wlp/usr/servers/defaultServer/* /opt/ol/wlp/usr/servers/$SERVER_NAME/
   ln -s /opt/ol/wlp/usr/servers/$SERVER_NAME /opt/ol/links/config
   mkdir -p /config/configDropins/defaults
   mkdir -p /config/configDropins/overrides

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

@@ -41,6 +41,7 @@ if [ "$SERVER_NAME" != "defaultServer" ] && [ -d "/opt/ol/wlp/usr/servers/defaul
   rm -rf /opt/ol/wlp/output/defaultServer
 
   # Add new server symlink and populate folder
+  mv /opt/ol/wlp/usr/servers/defaultServer/* /opt/ol/wlp/usr/servers/$SERVER_NAME/
   ln -s /opt/ol/wlp/usr/servers/$SERVER_NAME /opt/ol/links/config
   mkdir -p /config/configDropins/defaults
   mkdir -p /config/configDropins/overrides

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

@@ -41,6 +41,7 @@ if [ "$SERVER_NAME" != "defaultServer" ] && [ -d "/opt/ol/wlp/usr/servers/defaul
   rm -rf /opt/ol/wlp/output/defaultServer
 
   # Add new server symlink and populate folder
+  mv /opt/ol/wlp/usr/servers/defaultServer/* /opt/ol/wlp/usr/servers/$SERVER_NAME/
   ln -s /opt/ol/wlp/usr/servers/$SERVER_NAME /opt/ol/links/config
   mkdir -p /config/configDropins/defaults
   mkdir -p /config/configDropins/overrides

samples/spring-petclinic/Dockerfile

@@ -15,6 +15,10 @@ RUN springBootUtility thin \
  --targetLibCachePath=/staging/lib.index.cache
 
 FROM ${IMAGE}
+
+# Provide a custom Liberty server name other than "defaultServer"
+ENV SERVER_NAME=petclinic
+
 COPY --chown=1001:0 server.xml /config
 
 # This script will add the requested XML snippets to enable Liberty features and grow image to be fit-for-purpose using featureUtility