Merge pull request #648 from turbo124/debian

Updates for resolving filessystem

debian/.env

@@ -8,10 +8,16 @@ PHANTOMJS_PDF_GENERATION=false
 PDF_GENERATOR=snappdf
 TRUSTED_PROXIES='*'
 
+
+CACHE_DRIVER=redis
 QUEUE_CONNECTION=redis
+SESSION_DRIVER=redis
 
+REDIS_HOST=redis
+REDIS_PASSWORD=null
+REDIS_PORT=6379
 
-# FILESYSTEM_DISK=local
+FILESYSTEM_DISK=debian_docker
 
 # DB connection
 DB_HOST=mysql
@@ -52,4 +58,5 @@ NORDIGEN_SECRET_KEY=
 IS_DOCKER=true
 SCOUT_DRIVER=null
 SNAPPDF_CHROMIUM_PATH=/usr/bin/google-chrome-stable
-#SNAPPDF_CHROMIUM_PATH=/usr/bin/google-chrome
+
+

debian/Dockerfile

@@ -120,6 +120,8 @@ RUN set -eux; \
     curl -L "$DOWNLOAD_URL" | tar -xvz -C /var/www/html && \
     chown -R www-data:www-data /var/www/html
 
+USER www-data
+
 # Install dependencies
 RUN composer install --no-dev --no-scripts --no-autoloader
 
@@ -131,6 +133,8 @@ RUN composer dump-autoload --optimize \
     && php artisan route:cache \
     && php artisan storage:link
 
+USER root
+
 # Setup supervisor
 COPY supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 

debian/docker-compose.yml

@@ -8,7 +8,7 @@ x-logging: &default-logging
 
 services:
   app:
-    image: invoiceninja/invoiceninja-debian:latest
+    image: invoiceninja/invoiceninja-debian:latest 
     restart: unless-stopped
     env_file:
       - ./.env
@@ -16,7 +16,7 @@ services:
       - ./.env:/var/www/html/.env  
       - app_storage:/var/www/html/storage
       - app_cache:/var/www/html/bootstrap/cache
-      - public_storage:/var/www/html/public/storage
+      - app_files:/var/www/html
 
     networks:
       - app-network
@@ -39,8 +39,7 @@ services:
     volumes:
       - ./nginx/conf.d:/etc/nginx/conf.d:ro
       - ./nginx/nginx.conf:/etc/nginx/nginx.conf:ro
-    volumes_from:
-      - app
+      - app_files:/var/www/html:ro
 
     networks:
       - app-network
@@ -104,9 +103,9 @@ volumes:
     driver: local
   app_cache:
     driver: local
-  public_storage:
-    driver: local  # Persistent storage for user files
   mysql_data:
     driver: local
   redis_data:
-    driver: local
+    driver: local
+  app_files:
+    driver: local

debian/rootfs/docker-entrypoint-init.d/10-init-in.sh

@@ -3,11 +3,11 @@
 php artisan db:seed --force
 
 # Build up array of arguments...
-if [[ ! -z "${IN_USER_EMAIL}" ]]; then
+if [ ! -z "${IN_USER_EMAIL}" ]; then
     email="--email ${IN_USER_EMAIL}"
 fi
 
-if [[ ! -z "${IN_PASSWORD}" ]]; then
+if [ ! -z "${IN_PASSWORD}" ]; then
     password="--password ${IN_PASSWORD}"
 fi