Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
2 changes: 1 addition & 1 deletion bundler/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ARG OBA_VERSION=2.6.0
ARG OBA_VERSION=2.7.1

##############
# Go Builder #
Expand Down
13 changes: 7 additions & 6 deletions deployment-examples/immutable/Dockerfile.mbta
Original file line number Diff line number Diff line change
@@ -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:
Expand Down
10 changes: 7 additions & 3 deletions docker-compose.standalone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 6 additions & 2 deletions oba/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand Down Expand Up @@ -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}
Expand Down Expand Up @@ -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
##########
Expand Down
6 changes: 6 additions & 0 deletions oba/config/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@
<version>${OBA_VERSION}</version>
<type>jar</type>
</dependency>
<dependency>
<groupId>org.onebusaway</groupId>
<artifactId>onebusaway-api-key-cli</artifactId>
<version>${OBA_VERSION}</version>
<classifier>withAllDependencies</classifier>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
Expand Down
4 changes: 4 additions & 0 deletions oba/retrieve_maven_artifacts.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading