Skip to content

Commit

Permalink
Clean up oba/Dockerfile
Browse files Browse the repository at this point in the history
* Remove commented-out lines
* Get rid of two unnecessary `COPY` commands. The files in question are available in `/oba/config` and are handled by the bootstrap.sh script
  • Loading branch information
aaronbrethorst committed Dec 9, 2024
1 parent 9930ecd commit 3b77403
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions oba/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
##########
Expand All @@ -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
Expand Down Expand Up @@ -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
##########
Expand Down

0 comments on commit 3b77403

Please sign in to comment.