From 391ecf17327269defce6768de97f7e2e6eb2ad32 Mon Sep 17 00:00:00 2001 From: boris Date: Fri, 28 Nov 2025 10:08:36 +0000 Subject: [PATCH] Update Monolog action level to info, adjust Dockerfile permissions and logging configuration, and set supervisord user to root --- assets/app.js | 5 +++++ config/packages/monolog.yaml | 2 +- docker/php/Dockerfile | 4 +++- docker/prod/supervisord.conf | 1 + importmap.php | 14 ++++++++++++++ 5 files changed, 24 insertions(+), 2 deletions(-) create mode 100644 assets/app.js create mode 100644 importmap.php diff --git a/assets/app.js b/assets/app.js new file mode 100644 index 0000000..1f60f76 --- /dev/null +++ b/assets/app.js @@ -0,0 +1,5 @@ +// Placeholder front-end entrypoint to satisfy importmap & asset mapper. +// You can add real JS behavior here; for now we only register a noop. + +console.debug('Tonehaus assets initialized'); + diff --git a/config/packages/monolog.yaml b/config/packages/monolog.yaml index 9db7d8a..9afb9d9 100644 --- a/config/packages/monolog.yaml +++ b/config/packages/monolog.yaml @@ -42,7 +42,7 @@ when@prod: handlers: main: type: fingers_crossed - action_level: error + action_level: info handler: nested excluded_http_codes: [404, 405] buffer_size: 50 # How many messages should be saved? Prevent memory leaks diff --git a/docker/php/Dockerfile b/docker/php/Dockerfile index 8c52769..c224c97 100644 --- a/docker/php/Dockerfile +++ b/docker/php/Dockerfile @@ -125,7 +125,9 @@ COPY docker/prod/entrypoint.sh /entrypoint.sh RUN chmod +x /entrypoint.sh \ && mkdir -p /run/nginx /var/log/supervisor \ - && chown -R www-data:www-data /var/www/html + && chown -R www-data:www-data /run/nginx /var/log/supervisor /var/www/html +RUN mkdir -p /var/lib/nginx /var/log/nginx && chown -R www-data:www-data /var/lib/nginx /var/log/nginx +RUN sed -i 's|^error_log =.*|error_log = /proc/self/fd/2|' /usr/local/etc/php-fpm.conf EXPOSE 8080 diff --git a/docker/prod/supervisord.conf b/docker/prod/supervisord.conf index 2e7bd88..496f68e 100644 --- a/docker/prod/supervisord.conf +++ b/docker/prod/supervisord.conf @@ -2,6 +2,7 @@ nodaemon=true logfile=/var/log/supervisor/supervisord.log pidfile=/var/run/supervisord.pid +user=root [program:php-fpm] command=/usr/local/sbin/php-fpm --nodaemonize diff --git a/importmap.php b/importmap.php new file mode 100644 index 0000000..a062b38 --- /dev/null +++ b/importmap.php @@ -0,0 +1,14 @@ + [ + 'path' => './assets/app.js', + 'entrypoint' => true, + ], +]; +