diff --git a/CLAUDE.md b/CLAUDE.md index d4104dd..999d44a 100644 --- a/CLAUDE.md +++ b/CLAUDE.md @@ -68,7 +68,7 @@ docker compose up ### Key Technologies - **Build System**: Maven-based Java project -- **OneBusAway Version**: v2.6.0 (configurable via OBA_VERSION) +- **OneBusAway Version**: v2.7.1 (configurable via OBA_VERSION) - **Runtime**: Tomcat 8.5.100 with JDK 11 - **Databases**: MySQL 8.0 or PostgreSQL 16 - **GTFS Processing**: gtfstidy (Go-based optimizer) diff --git a/README.md b/README.md index ec1f64a..7c9929a 100644 --- a/README.md +++ b/README.md @@ -106,7 +106,7 @@ You can find the latest published Docker images on Docker Hub: * `VEHICLE_POSITIONS_URL` - Vehicle Positions URL for GTFS-RT. * `REFRESH_INTERVAL` - Refresh interval in seconds. Usually 10-30. * Specify one or the other: - * `AGENCY_ID_LIST` - Your GTFS-RT agency IDs. These should match the IDs in your agency.txt file. Format: abxoxo + * `AGENCY_ID_LIST` - Your GTFS-RT agency IDs. These should match the IDs in your agency.txt file. Format: `["id1","id2"]` * `AGENCY_ID` - Optional: Your GTFS-RT agency ID. Ostensibly the same as your GTFS agency ID. * Authentication (Optional) * Example: Specifying `FEED_API_KEY` = `X-API-KEY` and `FEED_API_VALUE` = `12345` will result in `X-API-KEY: 12345` being passed on every call to your GTFS-RT URLs. diff --git a/bundler/Dockerfile b/bundler/Dockerfile index 6ba45ac..48dcc85 100644 --- a/bundler/Dockerfile +++ b/bundler/Dockerfile @@ -1,4 +1,4 @@ -ARG OBA_VERSION=2.6.0 +ARG OBA_VERSION=2.7.1 ############## # Go Builder # diff --git a/deployment-examples/immutable/Dockerfile.mbta b/deployment-examples/immutable/Dockerfile.mbta index 6fd3825..c4bc634 100644 --- a/deployment-examples/immutable/Dockerfile.mbta +++ b/deployment-examples/immutable/Dockerfile.mbta @@ -1,17 +1,18 @@ # Inherit from the base onebusaway image -FROM opentransitsoftwarefoundation/onebusaway-api-webapp:2.6.0-latest +FROM opentransitsoftwarefoundation/onebusaway-api-webapp:2.7.1-latest COPY config/tdf-log4j2.xml /usr/local/tomcat/webapps/onebusaway-transit-data-federation-webapp/WEB-INF/classes/log4j2.xml # Set environment variables permanently ENV JDBC_DRIVER="org.postgresql.Driver" ENV TZ="America/New_York" -ENV GTFS_URL="https://cdn.mbta.com/MBTA_GTFS.zip" -ENV ALERTS_URL="https://cdn.mbta.com/realtime/Alerts.pb" -ENV TRIP_UPDATES_URL="https://cdn.mbta.com/realtime/TripUpdates.pb" -ENV VEHICLE_POSITIONS_URL="https://cdn.mbta.com/realtime/VehiclePositions.pb" +ENV GTFS_URL="https://passio3.com/uconn/passioTransit/gtfs/google_transit.zip" +ENV ALERTS_URL="https://passio3.com/uconn/passioTransit/gtfs/realtime/serviceAlerts" +ENV TRIP_UPDATES_URL="https://passio3.com/uconn/passioTransit/gtfs/realtime/tripUpdates" +ENV VEHICLE_POSITIONS_URL="https://passio3.com/uconn/passioTransit/gtfs/realtime/vehiclePositions" ENV REFRESH_INTERVAL="30" -ENV AGENCY_ID_LIST='["1","3"]' +ENV AGENCY_ID_LIST="1541" +# ENV AGENCY_ID_LIST='["1541"]' ENV REVISION="1" # Set these at runtime: diff --git a/docker-compose.standalone.yml b/docker-compose.standalone.yml index 76918e2..65cf2ef 100644 --- a/docker-compose.standalone.yml +++ b/docker-compose.standalone.yml @@ -42,10 +42,14 @@ services: - JDBC_USER=oba_user - JDBC_PASSWORD=oba_password - TEST_API_KEY=test # For test only, remove in production - - TZ=America/Los_Angeles - - AGENCY_ID=unitrans - - GTFS_URL=https://unitrans.ucdavis.edu/media/gtfs/Unitrans_GTFS.zip + - TZ=America/New_York + - AGENCY_ID=1541 + - GTFS_URL=https://passio3.com/uconn/passioTransit/gtfs/google_transit.zip - GTFS_TIDY_ARGS=OeD + - VEHICLE_POSITIONS_URL=https://passio3.com/uconn/passioTransit/gtfs/realtime/vehiclePositions + - TRIP_UPDATES_URL=https://passio3.com/uconn/passioTransit/gtfs/realtime/tripUpdates + - ALERTS_URL=https://passio3.com/uconn/passioTransit/gtfs/realtime/serviceAlerts + - REFRESH_INTERVAL=30 ports: # Access the webapp on your host machine at a path like diff --git a/oba/Dockerfile b/oba/Dockerfile index bbeef7a..8ee5797 100644 --- a/oba/Dockerfile +++ b/oba/Dockerfile @@ -1,4 +1,4 @@ -ARG OBA_VERSION=2.6.0 +ARG OBA_VERSION=2.7.1 ARG POSTGRESQL_CONNECTOR_VERSION=42.7.4 ARG MYSQL_CONNECTOR_VERSION=8.4.0 @@ -60,7 +60,7 @@ FROM tomcat:8.5.100-jdk11-temurin AS server ARG GTFS_TIDY_ARGS ENV GTFS_TIDY_ARGS=${GTFS_TIDY_ARGS} -ARG OBA_VERSION=2.6.0 +ARG OBA_VERSION=2.7.1 ARG POSTGRESQL_CONNECTOR_VERSION ENV POSTGRESQL_CONNECTOR_VERSION=${POSTGRESQL_CONNECTOR_VERSION} @@ -115,6 +115,10 @@ COPY --from=builder \ --chown=oba_user:oba_group \ /oba/libs/onebusaway-transit-data-federation-builder-withAllDependencies.jar . +COPY --from=builder \ + --chown=oba_user:oba_group \ + /oba/libs/onebusaway-api-key-cli-withAllDependencies.jar . + ########## # Copy over config files ########## diff --git a/oba/config/pom.xml b/oba/config/pom.xml index f1a779b..2dcea42 100644 --- a/oba/config/pom.xml +++ b/oba/config/pom.xml @@ -40,6 +40,12 @@ ${OBA_VERSION} jar + + org.onebusaway + onebusaway-api-key-cli + ${OBA_VERSION} + withAllDependencies + com.mysql mysql-connector-j diff --git a/oba/retrieve_maven_artifacts.sh b/oba/retrieve_maven_artifacts.sh index 9289a00..d56d35b 100644 --- a/oba/retrieve_maven_artifacts.sh +++ b/oba/retrieve_maven_artifacts.sh @@ -39,6 +39,10 @@ copy_and_rename_artifact \ "org.onebusaway:onebusaway-transit-data-federation-builder:${OBA_VERSION}:jar:withAllDependencies" \ "onebusaway-transit-data-federation-builder-withAllDependencies" +copy_and_rename_artifact \ + "org.onebusaway:onebusaway-api-key-cli:${OBA_VERSION}:jar:withAllDependencies" \ + "onebusaway-api-key-cli-withAllDependencies" + copy_and_rename_artifact \ "com.mysql:mysql-connector-j:${MYSQL_CONNECTOR_VERSION}:jar" \ "mysql-connector-j"