Bump JLab Wildfly to v3.0.1

Author: slominskir

Dockerfile

@@ -1,5 +1,5 @@
 ARG BUILD_IMAGE=gradle:9-jdk21
-ARG RUN_IMAGE=jeffersonlab/wildfly:2.2.0
+ARG RUN_IMAGE=jeffersonlab/wildfly:3.0.1
 
 ################## Stage 0
 FROM ${BUILD_IMAGE} AS builder
@@ -18,5 +18,26 @@ RUN cd /app && gradle build -x test --no-watch-fs $OPTIONAL_CERT_ARG
 ################## Stage 1
 FROM ${RUN_IMAGE} AS runner
 COPY --from=builder /app/container/app/app-setup.env /
-RUN /app-setup.sh /app-setup.env
-COPY --from=builder /app/build/libs/* /opt/jboss/wildfly/standalone/deployments
+USER root
+RUN /server-setup.sh /app-setup.env wildfly_start_and_wait \
+     && /app-setup.sh /app-setup.env config_keycloak_client \
+     && /app-setup.sh /app-setup.env config_oracle_client \
+     && /server-setup.sh /app-setup.env wildfly_reload \
+     && /server-setup.sh /app-setup.env wildfly_stop \
+     && rm -rf /opt/wildfly/current/standalone/configuration/standalone_xml_history
+USER dev
+COPY --from=builder /app/build/libs/* /opt/wildfly/current/standalone/deployments
+
+ENV TZ='America/New_York'
+
+# Used by container-entrypoint.sh
+ENV ORACLE_DATASOURCE='calendar'
+ENV ORACLE_SERVER='oracle:1521'
+ENV ORACLE_USER='CALENDAR_OWNER'
+ENV ORACLE_PASS='password'
+ENV ORACLE_SERVICE='xepdb1'
+
+# Used by app for path building
+ENV PUPPET_SHOW_SERVER_URL='http://puppet:3000'
+ENV BACKEND_SERVER_URL='http://calendar:8080'
+ENV FRONTEND_SERVER_URL='https://localhost:8443'

compose.yaml

@@ -20,14 +20,4 @@ services:
     ports:
       - "8443:8443"
       - "8080:8080"
-      - "9990:9990"
-    environment:
-      ORACLE_DATASOURCE: 'calendar'
-      ORACLE_SERVER: 'oracle:1521'
-      ORACLE_USER: 'CALENDAR_OWNER'
-      ORACLE_PASS: 'password'
-      ORACLE_SERVICE: 'xepdb1'
-      PUPPET_SHOW_SERVER_URL: 'http://puppet:3000'
-      BACKEND_SERVER_URL: 'http://calendar:8080'
-      FRONTEND_SERVER_URL: 'https://localhost:8443'
-      TZ: 'America/New_York'
+      - "9990:9990"

container/app/app-setup.env

@@ -8,5 +8,6 @@ ORACLE_PASS=password
 ORACLE_SERVER=oracle:1521
 ORACLE_SERVICE=xepdb1
 ORACLE_USER=CALENDAR_OWNER
-WILDFLY_APP_HOME=/opt/jboss/wildfly
+WILDFLY_RUN_USER=dev
+WILDFLY_APP_HOME=/opt/wildfly/current