Compare commits

..

1 Commits

Author SHA1 Message Date
Lance Pioch
9ecb47ba16 docker: send all supervised process output to the container log
Only Caddy's output reached docker logs. php-fpm and the queue worker
wrote to supervisord child logfiles under /tmp, so application errors and
failed queue jobs were invisible to 'docker logs' and any log collector.
Route stdout/stderr of every supervised program to fd 1.

Also on the queue worker:
- stopwaitsecs=3600 so in-flight jobs get to finish on shutdown instead
  of being SIGKILLed after supervisord's 10 second default (per the
  Laravel deployment docs; pair with a compose stop_grace_period if jobs
  routinely run long)
- --max-time=3600 so the long-lived worker recycles itself hourly as a
  memory-leak guard; supervisord restarts it automatically
2026-07-15 20:39:45 -04:00
4 changed files with 17 additions and 6 deletions

View File

@@ -93,7 +93,7 @@ COPY docker/crontab /etc/crontabs/crontab
COPY docker/entrypoint.sh /entrypoint.sh
COPY docker/healthcheck.sh /healthcheck.sh
HEALTHCHECK --interval=30s --timeout=10s --start-period=2m --retries=3 \
HEALTHCHECK --interval=5m --timeout=10s --start-period=5s --retries=3 \
CMD /bin/ash /healthcheck.sh
EXPOSE 80 443

View File

@@ -99,7 +99,7 @@ COPY docker/crontab /etc/crontabs/crontab
COPY docker/entrypoint.sh /entrypoint.sh
COPY docker/healthcheck.sh /healthcheck.sh
HEALTHCHECK --interval=30s --timeout=10s --start-period=2m --retries=3 \
HEALTHCHECK --interval=5m --timeout=10s --start-period=5s --retries=3 \
CMD /bin/ash /healthcheck.sh
EXPOSE 80 443

View File

@@ -1,9 +1,9 @@
#!/bin/ash -e
if [ "${SKIP_CADDY:-false}" != "true" ]; then
curl -sf http://localhost/up || exit 1
if [ ${SKIP_CADDY} ! "true" ]; then
curl -f http://localhost/up || exit 1
fi
cgi-fcgi -bind -connect 127.0.0.1:9000 || exit 2
exit 0
exit 0

View File

@@ -25,11 +25,20 @@ password=dummy
command=/usr/local/sbin/php-fpm -F
autostart=true
autorestart=true
stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0
redirect_stderr=true
[program:queue-worker]
command=/usr/local/bin/php /var/www/html/artisan queue:work --tries=3
command=/usr/local/bin/php /var/www/html/artisan queue:work --tries=3 --max-time=3600
autostart=true
autorestart=true
; give running jobs time to finish on shutdown instead of killing them
; after supervisord's 10 second default
stopwaitsecs=3600
stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0
redirect_stderr=true
[program:caddy]
command=caddy run --config /etc/caddy/Caddyfile --adapter caddyfile
@@ -44,4 +53,6 @@ redirect_stderr=true
command=supercronic -overlapping /etc/crontabs/crontab
autostart=true
autorestart=true
stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0
redirect_stderr=true