Merge pull request #111 from OneBusAway/improvements

Improvements

docker-compose.standalone.yml

@@ -15,15 +15,30 @@ services:
         target: /var/lib/mysql
     restart: always
 
+  oba_database_pg:
+    image: postgres:16
+    container_name: oba_database_pg
+    environment:
+      POSTGRES_USER: oba_user
+      POSTGRES_PASSWORD: oba_password
+      POSTGRES_DB: oba_database
+    ports:
+      - "5432:5432"
+    volumes:
+      - type: volume
+        source: pg-data
+        target: /var/lib/postgresql/data
+    restart: always
+
   oba_app:
     container_name: oba_app
     depends_on:
-      - oba_database
+      - oba_database_pg
     build:
       context: ./oba
     environment:
-      - JDBC_URL=jdbc:mysql://oba_database:3306/oba_database
-      - JDBC_DRIVER=com.mysql.cj.jdbc.Driver
+      - JDBC_URL=jdbc:postgresql://oba_database_pg:5432/oba_database
+      - JDBC_DRIVER=org.postgresql.Driver
       - JDBC_USER=oba_user
       - JDBC_PASSWORD=oba_password
       - TEST_API_KEY=test # For test only, remove in production
@@ -38,3 +53,4 @@ services:
 
 volumes:
   mysql-data:
+  pg-data:

docker-compose.yml

@@ -24,7 +24,7 @@ services:
     restart: always
 
   oba_database_pg:
-    image: postgres:15
+    image: postgres:16
     container_name: oba_database_pg
     environment:
       POSTGRES_USER: oba_user

oba/Dockerfile

@@ -100,15 +100,6 @@ COPY ./config/onebusaway-transit-data-federation-webapp-data-sources.xml.hbs .
 
 WORKDIR $CATALINA_HOME/webapps
 
-# COPY --from=builder \
-#      --chown=oba_user:oba_group \
-#      /oba/libs/postgresql.jar \
-#      $CATALINA_HOME/webapps/ROOT/WEB-INF/lib/
-
-# COPY ./config/onebusaway-enterprise-acta-webapp-data-sources.xml.hbs \
-#      $CATALINA_HOME/webapps/ROOT/WEB-INF/classes/data-sources.xml.hbs
-
-
 ##########
 # Configure onebusaway-api-webapp
 ##########
@@ -132,9 +123,6 @@ COPY --from=builder \
      /oba/libs/postgresql.jar \
      $CATALINA_HOME/webapps/ROOT/WEB-INF/lib/
 
-COPY ./config/onebusaway-api-webapp-data-sources.xml.hbs \
-     $CATALINA_HOME/webapps/onebusaway-api-webapp/WEB-INF/classes/data-sources.xml.hbs
-
 RUN mkdir -p /opt/oba/logs
 RUN chown -R oba_user:oba_group /opt/oba/logs
 RUN chmod 755 /opt/oba/logs
@@ -162,9 +150,6 @@ COPY --from=builder \
     /oba/libs/postgresql.jar \
     onebusaway-transit-data-federation-webapp/WEB-INF/lib/
 
-COPY ./config/onebusaway-transit-data-federation-webapp-data-sources.xml.hbs \
-     $CATALINA_HOME/webapps/onebusaway-transit-data-federation-webapp/WEB-INF/classes/data-sources.xml.hbs
-
 ##########
 # Clean up
 ##########

oba/bootstrap.sh

@@ -9,7 +9,7 @@ if [ -n "$GTFS_URL" ]; then
     mkdir -p /bundle
     wget -O /bundle/gtfs.zip "$GTFS_URL"
     cd /bundle \
-        && java -Xss4m -Xmx3g \
+        && java -Xss4m -Xmx2g \
             -jar /oba/libs/onebusaway-transit-data-federation-builder-withAllDependencies.jar \
             ./gtfs.zip \
             .