Merge pull request #100 from OneBusAway/acta-root

Make enterprise-acta-webapp accessible at `/`
OneBusAway · Sep 13, 2024 · 6410800 · 6410800
2 parents bd098da + e4347db
commit 6410800
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/oba/Dockerfile b/oba/Dockerfile
@@ -72,13 +72,13 @@ COPY ./config/onebusaway-api-webapp-data-sources.xml ./WEB-INF/classes/data-sour
 RUN cp $CATALINA_HOME/lib/mysql-connector-j-8.3.0.jar ./WEB-INF/lib
 RUN mv /oba/webapps/onebusaway-api-webapp $CATALINA_HOME/webapps
 
-WORKDIR /oba/webapps/onebusaway-enterprise-acta-webapp
+WORKDIR /oba/webapps/ROOT
 RUN cp /oba/libs/onebusaway-enterprise-acta-webapp-${OBA_VERSION}.war .
 RUN jar xvf onebusaway-enterprise-acta-webapp-${OBA_VERSION}.war
 RUN rm onebusaway-enterprise-acta-webapp-${OBA_VERSION}.war
 COPY ./config/onebusaway-enterprise-acta-webapp-data-sources.xml ./WEB-INF/classes/data-sources.xml.bak
 RUN cp $CATALINA_HOME/lib/mysql-connector-j-8.3.0.jar ./WEB-INF/lib
-RUN mv /oba/webapps/onebusaway-enterprise-acta-webapp $CATALINA_HOME/webapps
+RUN mv /oba/webapps/ROOT $CATALINA_HOME/webapps
 
 RUN rm -rf /oba/libs
 

diff --git a/oba/bootstrap.sh b/oba/bootstrap.sh
@@ -113,7 +113,7 @@ else
 fi
 
 # Google map related environment variables
-ENTERPRISE_ACTA_WEBAPP_XML_FILE="$CATALINA_HOME/webapps/onebusaway-enterprise-acta-webapp/WEB-INF/classes/data-sources.xml"
+ENTERPRISE_ACTA_WEBAPP_XML_FILE="$CATALINA_HOME/webapps/ROOT/WEB-INF/classes/data-sources.xml"
 BEAN_ID="configurationServiceClient"
 LOCAL_JSON_FILE="/var/lib/oba/config.json"
 # Idempotence