wululu_web/invoiceninja-docker
3
0
Fork 0
mirror of https://github.com/invoiceninja/dockerfiles.git synced 2026-02-03 20:57:12 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #279 from tms0/cleanup_supervisor

Browse Source 
Cleanup supervisor conf
This commit is contained in:
David Bomba
2021-03-24 07:51:13 +11:00
committed by GitHub
parent f175fa4fb0 f42fc93aa5
commit ff1dfee088
2 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
alpine/Dockerfile_v5
View File

@@ -88,9 +88,7 @@ RUN addgroup --gid=$UID -S "$INVOICENINJA_USER" \
--no-create-home \ --no-create-home \
"$INVOICENINJA_USER" \ "$INVOICENINJA_USER" \
&& addgroup "$INVOICENINJA_USER" www-data \ && addgroup "$INVOICENINJA_USER" www-data \
&& mkdir /var/log/supervisord /var/run/supervisord \ && chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /var/www/app
&& chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /var/www/app \
&& chown $INVOICENINJA_USER:www-data /var/log/supervisord /var/run/supervisord
USER $UID USER $UID
@@ -102,4 +100,4 @@ ENV LOG errorlog
ENV SNAPPDF_EXECUTABLE_PATH /usr/bin/chromium-browser ENV SNAPPDF_EXECUTABLE_PATH /usr/bin/chromium-browser
ENTRYPOINT ["docker-entrypoint"] ENTRYPOINT ["docker-entrypoint"]
CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

8
config/supervisor/supervisord.conf
View File

@@ -1,7 +1,6 @@
[supervisord] [supervisord]
nodaemon=true nodaemon=true
user=invoiceninja pidfile=/tmp/supervisord.pid
pidfile=/var/run/supervisord/supervisord.pid
logfile=/dev/null ; nodaemon will cause logs to go to stdout logfile=/dev/null ; nodaemon will cause logs to go to stdout
logfile_maxbytes=0 logfile_maxbytes=0
loglevel=error loglevel=error
@@ -36,7 +35,7 @@ stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0
numprocs=2 numprocs=2
command=php artisan queue:work --sleep=3 --tries=3 --memory=256 command=php artisan queue:work --sleep=3 --tries=1 --memory=256 --timeout=3600
[eventlistener:shutdown] [eventlistener:shutdown]
command=/shutdown.sh command=/shutdown.sh
@@ -44,4 +43,5 @@ events=PROCESS_STATE_STOPPED, PROCESS_STATE_EXITED, PROCESS_STATE_FATAL
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
stderr_logfile_maxbytes=0 stderr_logfile_maxbytes=0