update due to volume mount replacing folder

Author: cdoyle-temple

.docker/app/Dockerfile

@@ -50,15 +50,7 @@ RUN apk add -U --no-cache \
     if [ "${RAILS_ENV}" = "production" ]; then rm -rf tmp/*; fi && \
     if [ "${RAILS_ENV}" = "production" ]; then apk del build-dependencies; fi && \
     rm -rf /var/cache/apk/ && \
-<<<<<<< Updated upstream
-    mkdir -p /secure-tmp && chmod 700 /secure-tmp && \
-    mkdir -p /secure-tmp/log && chmod 700 /secure-tmp/log
-=======
-    mkdir -p /secure-tmp && \
-    chown 65534:65534 /secure-tmp && \
-    chmod 700 /secure-tmp && \
     rails users:sync_initial
->>>>>>> Stashed changes
 
 USER 65534:65534
 

.docker/app/entrypoint.sh

@@ -1,15 +1,12 @@
 #!/usr/bin/env bash
 set -e
 
-<<<<<<< Updated upstream
-rails db:prepare
-rails users:sync_initial
-=======
+mkdir -p /secure-tmp
+chmod 700 /secure-tmp
 mkdir -p /secure-tmp/log
 chmod 700 /secure-tmp/log
 
 rails db:migrate 2>/dev/null || rails db:setup
->>>>>>> Stashed changes
 rm -f /app/.internal_test_app/tmp/pids/server.pid
 
 exec "$@"