changed approach to shared volumes between nginx and app

.dockerignore

@@ -10,7 +10,6 @@ vendor
 .dockerignore
 docker-compose.yml
 Dockerfile
-Dockerfile.nginx
 AGENTS.MD
 DEPLOY.htaccess
 DEPLOYindex.php

Dockerfile

@@ -10,9 +10,13 @@ FROM php:8.2-cli-alpine AS composer
 COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 WORKDIR /app
 COPY composer.json composer.lock ./
-RUN composer install --no-dev --optimize-autoloader --no-scripts
+RUN composer install --no-dev --optimize-autoloader --no-scripts \
+    --ignore-platform-req=ext-gd \
+    --ignore-platform-req=ext-zip
 COPY . .
-RUN composer install --no-dev --optimize-autoloader
+RUN composer install --no-dev --optimize-autoloader \
+    --ignore-platform-req=ext-gd \
+    --ignore-platform-req=ext-zip
 
 
 FROM php:8.2-fpm-alpine AS ext-builder
@@ -52,10 +56,10 @@ WORKDIR /var/www/html
 COPY docker-entrypoint.sh /usr/local/bin/docker-entrypoint.sh
 RUN chmod +x /usr/local/bin/docker-entrypoint.sh
 
-COPY --chown=app:app . .
+COPY --chown=app:app . /app-source
 
-COPY --from=composer --chown=app:app /app/vendor ./vendor
+COPY --from=composer --chown=app:app /app/vendor /app-source/vendor
-COPY --from=node-build --chown=app:app /app/public/build ./public/build
+COPY --from=node-build --chown=app:app /app/public/build /app-source/public/build
 
 ENTRYPOINT ["docker-entrypoint.sh"]
 CMD ["php-fpm"]

docker-compose.yml

@@ -10,7 +10,7 @@ services:
       MYSQL_USER: ${DB_USERNAME}
       MYSQL_PASSWORD: ${DB_PASSWORD}
     healthcheck:
-      test: ["CMD", "mysqladmin", "ping", "-h", "localhost"]
+      test: ["CMD-SHELL", "mysqladmin ping -h localhost --ssl=0 -u root -p\"$$MYSQL_ROOT_PASSWORD\""]
       interval: 10s
       timeout: 5s
       retries: 10
@@ -22,6 +22,7 @@ services:
       context: .
       dockerfile: Dockerfile
     volumes:
+      - app-source:/var/www/html
       - app-storage:/var/www/html/storage
       - app-photos:/var/www/html/public/photos
     environment:
@@ -49,14 +50,14 @@ services:
       context: .
       dockerfile: Dockerfile.nginx
     volumes:
+      - app-source:/var/www/html:ro
       - app-photos:/var/www/html/public/photos:ro
-    ports:
-      - "${NGINX_PORT:-80}:80"
     depends_on:
       - app
     restart: unless-stopped
 
 volumes:
+  app-source:
   mariadb_data:
   app-storage:
   app-photos:

docker-entrypoint.sh

@@ -14,6 +14,12 @@ if [ "$(id -u)" = "0" ]; then
     chown -R app:app /var/www/html/storage /var/www/html/public/photos
 fi
 
+# Sync app source from image to volume
+if [ -d /app-source ]; then
+    echo "Syncing app source to volume..."
+    cp -a /app-source/. /var/www/html/
+fi
+
 # 1. Wait for MySQL
 echo "Waiting for MySQL..."
 for i in $(seq 1 30); do
@@ -78,9 +84,5 @@ php artisan view:cache
 # 6. Storage link
 php artisan storage:link 2>/dev/null || true
 
-# 7. Switch to app user and start PHP-FPM
+# 7. Start PHP-FPM
-if [ "$(id -u)" = "0" ]; then
-    exec su-exec app php-fpm
-else
 exec php-fpm
-fi

docker-nginx.conf

@@ -1,16 +1,15 @@
 server {
     listen 80;
     server_name _;
-    root /var/www/html/public;
+    root /var/www/html;
-    index index.php;
 
     location / {
-        try_files $uri $uri/ /index.php?$query_string;
+        try_files $uri /index.php?$query_string;
     }
 
     location ~ \.php$ {
         fastcgi_pass app:9000;
-        fastcgi_param SCRIPT_FILENAME $realpath_root$fastcgi_script_name;
+        fastcgi_param SCRIPT_FILENAME /var/www/html$fastcgi_script_name;
         include fastcgi_params;
     }