Merge pull request #429 from sil-org/mv-app-home

move the app from /data to /app

Author: briskt

.gitignore

@@ -25,5 +25,5 @@ serverless-mfa-api/override/server/*.go
 u2f-simulator/override/*.go
 u2f-simulator/override/u2fserver/*.go
 
-# Test email messages are stored in application/frontend/runtime/mail
-application/frontend/runtime/
+# Test email messages are stored in /app/frontend/runtime/mail
+app/frontend/runtime/

Dockerfile

@@ -10,15 +10,15 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
   && rm -rf /var/lib/apt/lists/* \
   && a2enmod ssl
 
-WORKDIR /data
+ENV APP_HOME=/app
+WORKDIR $APP_HOME
 
 # Install/cleanup composer dependencies
-COPY application/composer.json /data/
-COPY application/composer.lock /data/
+COPY app/composer.json $APP_HOME
+COPY app/composer.lock $APP_HOME
 RUN composer install --prefer-dist --no-interaction --no-dev --optimize-autoloader --no-progress
 
-# It is expected that /data is = application/ in project folder
-COPY application/ /data/
+COPY app/ $APP_HOME
 
 # Fix folder permissions
 RUN chown -R www-data:www-data \
@@ -30,4 +30,4 @@ COPY dockerbuild/vhost.conf /etc/apache2/sites-enabled/
 RUN sed -i -E 's@ErrorLog .*@ErrorLog /proc/self/fd/2@i' /etc/apache2/apache2.conf
 
 EXPOSE 80
-CMD ["/data/run.sh"]
+CMD ["/app/run.sh"]

README.md

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 # Try to install composer dev dependencies
-cd /data
+cd "$APP_HOME"
 composer install --no-interaction --no-scripts --no-progress
 
 # Check the code against PSR-12.