From 83f17aa66907aa5e2cc7e38e6b277cfe1a3a95ab Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 24 Nov 2024 19:56:02 +1100
Subject: [PATCH] Updates for resolving filessystem

---
 debian/.env                                         | 11 +++++++++--
 debian/Dockerfile                                   |  4 ++++
 debian/docker-compose.yml                           | 13 ++++++-------
 .../rootfs/docker-entrypoint-init.d/10-init-in.sh   |  4 ++--
 4 files changed, 21 insertions(+), 11 deletions(-)

diff --git a/debian/.env b/debian/.env
index 5925e1a..a993551 100644
--- a/debian/.env
+++ b/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
+
+
diff --git a/debian/Dockerfile b/debian/Dockerfile
index 24665db..1d7d059 100644
--- a/debian/Dockerfile
+++ b/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
 
diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml
index 9136101..70a3bec 100644
--- a/debian/docker-compose.yml
+++ b/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
\ No newline at end of file
+    driver: local
+  app_files:
+    driver: local
diff --git a/debian/rootfs/docker-entrypoint-init.d/10-init-in.sh b/debian/rootfs/docker-entrypoint-init.d/10-init-in.sh
index 3ff5032..b744011 100644
--- a/debian/rootfs/docker-entrypoint-init.d/10-init-in.sh
+++ b/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