From 69e6ef3e8bac0c548cde4e6a0ea6870db475aa87 Mon Sep 17 00:00:00 2001
From: Philip Peterson <1326208+philip-peterson@users.noreply.github.com>
Date: Fri, 5 Jun 2026 00:04:37 -0700
Subject: [PATCH] fixes

---
 Dockerfile               | 11 +++++------
 docker/php/entrypoint.sh |  3 +++
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 6b5e2ee..aaf8830 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -81,17 +81,16 @@ COPY docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
 COPY docker/php/entrypoint.sh /entrypoint.sh
 RUN chmod +x /entrypoint.sh
 
-# Pass container env vars through to PHP-FPM workers; capture worker stderr so errors appear in container logs.
-RUN { \
+# Pass container env vars through to PHP-FPM workers; log errors to /var/log.
+RUN sed -i 's|;error_log = log/php-fpm.log|error_log = /var/log/php-fpm.log|' /usr/local/etc/php-fpm.conf && \
+    { \
       echo 'clear_env = no'; \
       echo 'catch_workers_output = yes'; \
       echo 'php_admin_flag[log_errors] = on'; \
-      echo 'php_admin_value[error_log] = /dev/stderr'; \
+      echo 'php_admin_value[error_log] = /var/log/php-fpm.www.log'; \
     } >> /usr/local/etc/php-fpm.d/zz-env.conf
 
-RUN chown -R www-data:www-data web/sites/default/files && \
-    chmod -R 755 web/sites/default/files && \
-    chmod 444 web/sites/default/settings.php
+RUN chmod 444 web/sites/default/settings.php
 
 EXPOSE 80
 ENTRYPOINT ["/entrypoint.sh"]
diff --git a/docker/php/entrypoint.sh b/docker/php/entrypoint.sh
index 09ec1ea..8f53d9d 100644
--- a/docker/php/entrypoint.sh
+++ b/docker/php/entrypoint.sh
@@ -12,6 +12,9 @@ for var in SITE_NAME ADMIN_PASS; do
   fi
 done
 
+chown -R www-data:www-data /var/www/html/web/sites/default/files
+chmod -R 755 /var/www/html/web/sites/default/files
+
 echo "[entrypoint] Waiting for PostgreSQL at ${DB_HOST}..."
 until pg_isready -h "$DB_HOST" -U "$DB_USER" -d "$DB_NAME" -q; do
   sleep 1