wululu_web/invoiceninja-docker
3
0
Fork 0
mirror of https://github.com/invoiceninja/dockerfiles.git synced 2025-12-31 19:47:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #694 from benbrummer/debian

Browse Source 
Fix for reap logging
This commit is contained in:
David Bomba
2025-01-15 08:56:09 +11:00
committed by GitHub
parent 3b0f7c463a a2b64d2060
commit 2c25caf627
2 changed files with 12 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
debian/Dockerfile vendored
View File

@@ -68,7 +68,7 @@ COPY php/php.ini /usr/local/etc/php/conf.d/invoiceninja.ini
COPY php/php-fpm.conf /usr/local/etc/php-fpm.d/invoiceninja.conf COPY php/php-fpm.conf /usr/local/etc/php-fpm.d/invoiceninja.conf
# Setup supervisor --chown=www-data:www-data # Setup supervisor
COPY supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf COPY supervisor/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
# Setup InvoiceNinja # Setup InvoiceNinja
@@ -80,7 +80,7 @@ COPY --chmod=0755 scripts/init.sh /usr/local/bin/init.sh
# Health check # Health check
HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \ HEALTHCHECK --interval=30s --timeout=5s --start-period=30s --retries=3 \
CMD php -v || exit 1 CMD pgrep -f "php-fpm: master process"
ENTRYPOINT ["/usr/local/bin/init.sh"] ENTRYPOINT ["/usr/local/bin/init.sh"]
CMD ["supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"] CMD ["supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]

29
debian/supervisor/supervisord.conf vendored
View File

@@ -1,32 +1,25 @@
[unix_http_server]
file=/var/run/supervisor.sock
chmod=0700
[supervisord] [supervisord]
nodaemon=true nodaemon=true
user=root user=root
logfile=/var/log/supervisor/supervisord.log logfile=/dev/null
logfile_maxbytes=0
pidfile=/var/run/supervisord.pid pidfile=/var/run/supervisord.pid
[rpcinterface:supervisor] [rpcinterface:supervisor]
supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface supervisor.rpcinterface_factory=supervisor.rpcinterface:make_main_rpcinterface
[supervisorctl]
serverurl=unix:///var/run/supervisor.sock
[program:php-fpm] [program:php-fpm]
command=/usr/local/sbin/php-fpm -F command=/usr/local/sbin/php-fpm -F
autostart=true autostart=true
autorestart=true autorestart=true
priority=5 priority=5
stdout_logfile=/dev/stdout stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr redirect_stderr=true
stderr_logfile_maxbytes=0
[program:queue-worker] [program:queue-worker]
process_name=%(program_name)s_%(process_num)02d process_name=%(program_name)s_%(process_num)02d
command=php /var/www/html/artisan queue:work --sleep=3 --tries=3 --max-time=3600 command=php /var/www/html/artisan queue:work --sleep=3 --tries=3 --max-time=3600 --verbose
autostart=true autostart=true
autorestart=true autorestart=true
stopasgroup=true stopasgroup=true
@@ -34,18 +27,16 @@ killasgroup=true
user=www-data user=www-data
numprocs=2 numprocs=2
environment=HOME="/var/www" environment=HOME="/var/www"
stdout_logfile=/dev/stdout stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr redirect_stderr=true
stderr_logfile_maxbytes=0
stopwaitsecs=3600 stopwaitsecs=3600
[program:scheduler] [program:scheduler]
command=php /var/www/html/artisan schedule:work --verbose --no-interaction command=php /var/www/html/artisan schedule:work --verbose
autostart=true autostart=true
autorestart=true autorestart=true
user=www-data user=www-data
stdout_logfile=/dev/stdout stdout_logfile=/dev/fd/1
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr redirect_stderr=true
stderr_logfile_maxbytes=0