PostgreSQL support added to docker-compose.yml and Non-root user upda…

…te included

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
+RUN mv /oba/webapps/onebusaway-enterprise-acta-webapp $CATALINA_HOME/webapps