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,38 @@ 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='presenter'
+ENV ORACLE_SERVER='oracle:1521'
+ENV ORACLE_USER='PRESENTER_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://presenter:8080'
+ENV FRONTEND_SERVER_URL='https://localhost:8443'
+
+# App specific
+ENV LOGBOOK_SERVER_URL='https://logbooks.jlab.org'
+ENV DTM_URL='https://ace.jlab.org/dtm'
+ENV BTM_URL='https://ace.jlab.org/btm'
+ENV RESIZE_URL='http://resize:8080/resize'
+ENV SRM_URL: 'https://ace.jlab.org/srm'
+ENV CALENDAR_URL='https://ace.jlab.org/calendar'
+ENV WORKMAP_URL='https://ace.jlab.org/workmap'
+ENV WEATHER_URL='https://accweb.acc.jlab.org/weather'
+ENV WHITEBOARD_URL='https://cebaf.jlab.org/files/ops/accboard/'
+ENV POWER_URL='https://ace.jlab.org/apps/meters-dashboard'

compose.yaml

@@ -26,22 +26,3 @@ services:
       - "8443:8443"
       - "8080:8080"
       - "9990:9990"
-    environment:
-      ORACLE_DATASOURCE: 'presenter'
-      ORACLE_SERVER: 'oracle:1521'
-      ORACLE_USER: 'PRESENTER_OWNER'
-      ORACLE_PASS: 'password'
-      ORACLE_SERVICE: 'xepdb1'
-      PUPPET_SHOW_SERVER_URL: 'http://puppet:3000'
-      BACKEND_SERVER_URL: 'http://presenter:8080'
-      FRONTEND_SERVER_URL: 'https://localhost:8443'
-      DTM_URL: 'https://ace.jlab.org/dtm'
-      BTM_URL: 'https://ace.jlab.org/btm'
-      RESIZE_URL: 'http://resize:8080/resize'
-      SRM_URL: 'https://ace.jlab.org/srm'
-      CALENDAR_URL: 'https://ace.jlab.org/calendar'
-      WORKMAP_URL: 'https://ace.jlab.org/workmap'
-      WEATHER_URL: 'https://accweb.acc.jlab.org/weather'
-      WHITEBOARD_URL: 'https://cebaf.jlab.org/files/ops/accboard/'
-      POWER_URL: 'https://ace.jlab.org/apps/meters-dashboard'
-      TZ: 'America/New_York'

container/app/app-setup.env

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