From 1b62d8665908412e374b3cc7d6177929856c9d69 Mon Sep 17 00:00:00 2001
From: David Bomba <turbo124@gmail.com>
Date: Sun, 24 Nov 2024 08:43:50 +1100
Subject: [PATCH] Fixes for permissions on container init

---
 debian/Dockerfile         | 23 ++++-------------------
 debian/docker-compose.yml |  1 -
 2 files changed, 4 insertions(+), 20 deletions(-)

diff --git a/debian/Dockerfile b/debian/Dockerfile
index 61a9209..3d6765a 100644
--- a/debian/Dockerfile
+++ b/debian/Dockerfile
@@ -117,19 +117,9 @@ WORKDIR /var/www/html
 RUN set -eux; \ 
     DOWNLOAD_URL=$(curl -s "https://api.github.com/repos/invoiceninja/invoiceninja/releases/latest" | \
     grep -o '"browser_download_url": "[^"]*invoiceninja.tar"' | cut -d '"' -f 4) && \
-    echo "Downloading from: $DOWNLOAD_URL" && \
-    # Download and save the tar
-    curl -L "$DOWNLOAD_URL" -o /tmp/ninja.tar && \
-    # Try extraction
-    cd /var/www/html && \
-    tar -xf /tmp/ninja.tar && \
-    # List what was extracted
-    rm -f /tmp/ninja.tar && \
+    curl -L "$DOWNLOAD_URL" | tar -xvz -C /var/www/html && \
     chown -R www-data:www-data /var/www/html
 
-# After setting permissions, switch to www-data for remaining operations
-USER www-data
-
 # Install dependencies
 RUN composer install --no-dev --no-scripts --no-autoloader
 
@@ -140,8 +130,6 @@ RUN composer dump-autoload --optimize \
     && php artisan config:cache \
     && php artisan route:cache
 
-USER root
-
 # Setup supervisor
 COPY supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 
@@ -162,7 +150,7 @@ RUN mkdir -p \
     /var/www/html/storage/framework/sessions \
     /var/www/html/storage/framework/views \
     /var/www/html/storage/logs \
-    /var/www/html/public/storage \
+    /var/www/html/public/uploads \
     /var/run \
     /var/log/supervisor 
 
@@ -170,19 +158,16 @@ RUN mkdir -p \
 RUN chown -R www-data:www-data \
     /var/www/html/storage \
     /var/www/html/bootstrap/cache \
-    /var/www/html/public/storage \
+    /var/www/html/public/uploads \
     /var/run \
     /var/log/supervisor \
     && chmod -R 775 \
-        /var/www/html/public/storage \
+        /var/www/html/public/uploads \
         /var/www/html/storage \
         /var/www/html/bootstrap/cache \
         /var/run \
         /var/log/supervisor 
 
-# Switch to www-data for runtime
-USER www-data
-
 # Health check
 HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \
     CMD php -v || exit 1
diff --git a/debian/docker-compose.yml b/debian/docker-compose.yml
index 5cc66af..9136101 100644
--- a/debian/docker-compose.yml
+++ b/debian/docker-compose.yml
@@ -17,7 +17,6 @@ services:
       - app_storage:/var/www/html/storage
       - app_cache:/var/www/html/bootstrap/cache
       - public_storage:/var/www/html/public/storage
-    user: www-data:www-data 
 
     networks:
       - app-network