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
@@ -25,6 +25,30 @@ RUN /server-setup.sh /app-setup.env wildfly_start_and_wait \
      && /server-setup.sh /app-setup.env config_email \
      && /server-setup.sh /app-setup.env wildfly_reload \
      && /server-setup.sh /app-setup.env wildfly_stop \
-     && rm -rf /opt/jboss/wildfly/standalone/configuration/standalone_xml_history \
-USER jboss:jboss
-COPY --from=builder /app/build/libs/* /opt/jboss/wildfly/standalone/deployments
+     && 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 app runtime smoothness weblib User Directory Cache
+ENV KEYCLOAK_FRONTEND_SERVER_URL='http://localhost:8081/auth'
+ENV KEYCLOAK_BACKEND_SERVER_URL='http://keycloak:8080/auth'
+ENV KEYCLOAK_REALM='test-realm'
+ENV KEYCLOAK_RESOURCE='srm'
+ENV KEYCLOAK_SECRET='yHi6W2raPmLvPXoxqMA7VWbLAA2WN0eB'
+
+# Used by container-entrypoint.sh
+ENV ORACLE_DATASOURCE='srm'
+ENV ORACLE_SERVER='oracle:1521'
+ENV ORACLE_USER='SRM_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://srm:8080'
+ENV FRONTEND_SERVER_URL='https://localhost:8443'
+
+# App specific
+ENV LOGBOOK_SERVER_URL='https://logbooks.jlab.org'

build.yaml

@@ -3,8 +3,6 @@ services:
     extends:
       file: compose.yaml
       service: oracle
-    volumes:
-      - ./run/oracle/oradata:/opt/oracle/oradata
 
   keycloak:
     extends:

compose.yaml

@@ -25,25 +25,4 @@ services:
     ports:
       - "8443:8443"
       - "8080:8080"
-      - "9990:9990"
-    environment:
-      KEYCLOAK_REALM: 'test-realm'
-      KEYCLOAK_RESOURCE: 'srm'
-      KEYCLOAK_SECRET: 'yHi6W2raPmLvPXoxqMA7VWbLAA2WN0eB'
-      KEYCLOAK_FRONTEND_SERVER_URL: 'http://localhost:8081'
-      KEYCLOAK_BACKEND_SERVER_URL: 'http://keycloak:8080'
-      LOGBOOK_SERVER_URL: 'https://logbooks.jlab.org'
-      ORACLE_DATASOURCE: 'srm'
-      ORACLE_SERVER: 'oracle:1521'
-      ORACLE_USER: 'SRM_OWNER'
-      ORACLE_PASS: 'password'
-      ORACLE_SERVICE: 'xepdb1'
-      PUPPET_SHOW_SERVER_URL: 'http://puppet:3000'
-      BACKEND_SERVER_URL: 'http://srm:8080'
-      FRONTEND_SERVER_URL: 'https://localhost:8443'
-      TZ: 'America/New_York'
-      SRM_FEEDBACK_SENDER_ADDRESS: 'srm@example.com'
-      SRM_FEEDBACK_TO_ADDRESS_CSV: 'recipient1@example.com,recipient2@example.com'
-      SRM_CONTENT_CONTACT: 'bob@example.com'
-      SRM_TECHNICAL_CONTACT: 'larry@example.com'
-      SRM_DOC_CSV: 'https://github.com/JeffersonLab/srm|SRM Home,https://ace.jlab.org/cdn/doc/srm/FAQ.pdf|FAQ,https://ace.jlab.org/cdn/doc/srm/Training.pptx|Training,https://ace.jlab.org/cdn/doc/srm/ScheduleTemplate.pdf|Schedule,https://ace.jlab.org/cdn/doc/srm/LERFGuidance.docx|LERF Guidance'
+      - "9990:9990"

container/app/app-setup.env

@@ -8,8 +8,8 @@ ORACLE_PASS=password
 ORACLE_SERVER=oracle:1521
 ORACLE_SERVICE=xepdb1
 ORACLE_USER=SRM_OWNER
-WILDFLY_RUN_USER=jboss
-WILDFLY_APP_HOME=/opt/jboss/wildfly
+WILDFLY_RUN_USER=dev
+WILDFLY_APP_HOME=/opt/wildfly/current
 EMAIL_FROM=tester@example.com
 EMAIL_HOST=mailhog
 EMAIL_PORT=1025