From bd8b1398d22accb518bdc7bbe54c4a8b82f8d9f0 Mon Sep 17 00:00:00 2001
From: CesarAndrade007 <clopezandrade@ucdavis.edu>
Date: Wed, 28 Feb 2024 20:14:53 -0800
Subject: [PATCH] PostgreSQL support added to docker-compose.yml and Non-root
 user update included

---
 oba/Dockerfile | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/oba/Dockerfile b/oba/Dockerfile
index 02eb682..c540363 100644
--- a/oba/Dockerfile
+++ b/oba/Dockerfile
@@ -8,7 +8,13 @@ ARG UID=1000
 ARG GROUP=oba_group
 ARG USER=oba_user
 
-RUN groupadd -g ${GID} ${GROUP} && useradd -m -u ${UID} -g ${GID} ${USER}
+RUN groupadd -g $GID $GROUP && \
+    useradd -d /home/$USER -u $UID -m -s /bin/bash -g $GROUP $USER && \
+    chown -R $USER:$GROUP $CATALINA_HOME && \
+    mkdir -p /var/log/tomcat8 && \
+    chown -R $USER:$GROUP /var/log/tomcat8
+
+USER $USER
 
 # MySQL Connector
 WORKDIR $CATALINA_HOME/lib
@@ -49,11 +55,4 @@ 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
 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 chown -R ${USER}:${GROUP} ${CATALINA_HOME} \
- && chown -R ${USER}:${GROUP} ${CATALINA_HOME}/lib \
- && chown -R ${USER}:${GROUP} /oba/libs \
- && chown -R ${USER}:${GROUP} /oba/webapps
-
-USER oba_user
\ No newline at end of file
+RUN mv /oba/webapps/onebusaway-enterprise-acta-webapp $CATALINA_HOME/webapps
\ No newline at end of file