Initialize SERVER_NAME env with defaultServer

kabicin · kabicin · commit 73f683da6588 · 2023-05-31T16:36:16.000-04:00
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubi.ibmjava8 b/ga/22.0.0.12/kernel/Dockerfile.ubi.ibmjava8
@@ -20,6 +20,8 @@ ARG EN_SHA=1e17d4aaf1fa467f73b9b8b81c1cb0ef2839ef5e9772cad5821e0322fb3f455a
 ARG NON_IBM_SHA=bb36c29ffe57a4cb5805d5cdcaa2594229e8caded88ec178aea3561fac30b06a
 ARG NOTICES_SHA=3f1afde6d12d56d4c96bb3005aa9f80c78089b9b358e952974fe1fad9f4cf3a4
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubi.openjdk11 b/ga/22.0.0.12/kernel/Dockerfile.ubi.openjdk11
@@ -20,6 +20,8 @@ ARG EN_SHA=1e17d4aaf1fa467f73b9b8b81c1cb0ef2839ef5e9772cad5821e0322fb3f455a
 ARG NON_IBM_SHA=bb36c29ffe57a4cb5805d5cdcaa2594229e8caded88ec178aea3561fac30b06a
 ARG NOTICES_SHA=3f1afde6d12d56d4c96bb3005aa9f80c78089b9b358e952974fe1fad9f4cf3a4
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubi.openjdk17 b/ga/22.0.0.12/kernel/Dockerfile.ubi.openjdk17
@@ -20,6 +20,8 @@ ARG EN_SHA=1e17d4aaf1fa467f73b9b8b81c1cb0ef2839ef5e9772cad5821e0322fb3f455a
 ARG NON_IBM_SHA=bb36c29ffe57a4cb5805d5cdcaa2594229e8caded88ec178aea3561fac30b06a
 ARG NOTICES_SHA=3f1afde6d12d56d4c96bb3005aa9f80c78089b9b358e952974fe1fad9f4cf3a4
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Chris Potter, Melissa Lee" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubi.openjdk8 b/ga/22.0.0.12/kernel/Dockerfile.ubi.openjdk8
@@ -20,6 +20,8 @@ ARG EN_SHA=1e17d4aaf1fa467f73b9b8b81c1cb0ef2839ef5e9772cad5821e0322fb3f455a
 ARG NON_IBM_SHA=bb36c29ffe57a4cb5805d5cdcaa2594229e8caded88ec178aea3561fac30b06a
 ARG NOTICES_SHA=3f1afde6d12d56d4c96bb3005aa9f80c78089b9b358e952974fe1fad9f4cf3a4
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/22.0.0.12/kernel/Dockerfile.ubuntu.ibmjava8
@@ -20,6 +20,8 @@ ARG EN_SHA=1e17d4aaf1fa467f73b9b8b81c1cb0ef2839ef5e9772cad5821e0322fb3f455a
 ARG NON_IBM_SHA=bb36c29ffe57a4cb5805d5cdcaa2594229e8caded88ec178aea3561fac30b06a
 ARG NOTICES_SHA=3f1afde6d12d56d4c96bb3005aa9f80c78089b9b358e952974fe1fad9f4cf3a4
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubuntu.openjdk11 b/ga/22.0.0.12/kernel/Dockerfile.ubuntu.openjdk11
@@ -20,6 +20,8 @@ ARG EN_SHA=1e17d4aaf1fa467f73b9b8b81c1cb0ef2839ef5e9772cad5821e0322fb3f455a
 ARG NON_IBM_SHA=bb36c29ffe57a4cb5805d5cdcaa2594229e8caded88ec178aea3561fac30b06a
 ARG NOTICES_SHA=3f1afde6d12d56d4c96bb3005aa9f80c78089b9b358e952974fe1fad9f4cf3a4
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Christy Jesuraj" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/ga/22.0.0.12/kernel/Dockerfile.ubuntu.openjdk17 b/ga/22.0.0.12/kernel/Dockerfile.ubuntu.openjdk17
@@ -20,6 +20,8 @@ ARG EN_SHA=1e17d4aaf1fa467f73b9b8b81c1cb0ef2839ef5e9772cad5821e0322fb3f455a
 ARG NON_IBM_SHA=bb36c29ffe57a4cb5805d5cdcaa2594229e8caded88ec178aea3561fac30b06a
 ARG NOTICES_SHA=3f1afde6d12d56d4c96bb3005aa9f80c78089b9b358e952974fe1fad9f4cf3a4
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Chris Potter, Christy Jesuraj, Melissa Lee" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8 b/ga/23.0.0.3/kernel/Dockerfile.ubi.ibmjava8
@@ -20,6 +20,8 @@ ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f
 ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f
 ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk11 b/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk11
@@ -20,6 +20,8 @@ ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f
 ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f
 ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk17 b/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk17
@@ -20,6 +20,8 @@ ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f
 ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f
 ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Chris Potter, Melissa Lee" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk8 b/ga/23.0.0.3/kernel/Dockerfile.ubi.openjdk8
@@ -20,6 +20,8 @@ ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f
 ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f
 ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubuntu.ibmjava8 b/ga/23.0.0.3/kernel/Dockerfile.ubuntu.ibmjava8
@@ -20,6 +20,8 @@ ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f
 ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f
 ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Leo Christy Jesuraj, Arthur De Magalhaes, Chris Potter" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk11 b/ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk11
@@ -20,6 +20,8 @@ ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f
 ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f
 ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Arthur De Magalhaes, Chris Potter, Christy Jesuraj" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk17 b/ga/23.0.0.3/kernel/Dockerfile.ubuntu.openjdk17
@@ -20,6 +20,8 @@ ARG EN_SHA=366618db4b733337adc71ec30b1f33d36cf78a81858636360061036a926f373f
 ARG NON_IBM_SHA=d349f6ea3acd71910348904dd48f81940b86ca5f879737206ae37f858767ad0f
 ARG NOTICES_SHA=e7031658e09e2442279db72eed9238fb30d98c06dabb112fb21b8618b7e810ee
 
+ENV SERVER_NAME=defaultServer
+
 LABEL org.opencontainers.image.authors="Chris Potter, Christy Jesuraj, Melissa Lee" \
       org.opencontainers.image.vendor="IBM" \
       org.opencontainers.image.url="http://wasdev.net" \
diff --git a/test/test-pet-clinic/Dockerfile b/test/test-pet-clinic/Dockerfile
@@ -15,6 +15,9 @@ RUN configure.sh
 
 FROM ${IMAGE}
 
+# Provide a custom Liberty server name other than "defaultServer"
+ENV SERVER_NAME=petclinic
+
 COPY --from=staging /config/server.xml /config/server.xml
 
 RUN features.sh
diff --git a/test/test-stock-quote/Dockerfile b/test/test-stock-quote/Dockerfile
@@ -15,6 +15,9 @@
 
 FROM ibmcom/websphere-liberty:kernel-java17-openj9-ubi
 
+# Provide a custom Liberty server name other than "defaultServer"
+ENV SERVER_NAME=stock-quote
+
 COPY --chown=1001:0 config /config/
 
 ARG VERBOSE=false
diff --git a/test/test-stock-trader/Dockerfile b/test/test-stock-trader/Dockerfile
@@ -14,6 +14,9 @@
 
 FROM ibmcom/websphere-liberty:kernel-java8-openj9-ubi
 
+# Provide a custom Liberty server name other than "defaultServer"
+ENV SERVER_NAME=stock-trader
+
 COPY --chown=1001:0 config /config/
 
 ARG VERBOSE=false
