diff --git a/alpine/Dockerfile_v5 b/alpine/Dockerfile_v5 index b513a4b..6fa6321 100644 --- a/alpine/Dockerfile_v5 +++ b/alpine/Dockerfile_v5 @@ -88,9 +88,7 @@ RUN addgroup --gid=$UID -S "$INVOICENINJA_USER" \ --no-create-home \ "$INVOICENINJA_USER" \ && addgroup "$INVOICENINJA_USER" www-data \ - && mkdir /var/log/supervisord /var/run/supervisord \ - && chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /var/www/app \ - && chown $INVOICENINJA_USER:www-data /var/log/supervisord /var/run/supervisord + && chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /var/www/app USER $UID @@ -102,4 +100,4 @@ ENV LOG errorlog ENV SNAPPDF_EXECUTABLE_PATH /usr/bin/chromium-browser ENTRYPOINT ["docker-entrypoint"] -CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] \ No newline at end of file +CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"] diff --git a/config/supervisor/supervisord.conf b/config/supervisor/supervisord.conf index 80c968b..af71b2b 100644 --- a/config/supervisor/supervisord.conf +++ b/config/supervisor/supervisord.conf @@ -1,7 +1,6 @@ [supervisord] nodaemon=true -user=invoiceninja -pidfile=/var/run/supervisord/supervisord.pid +pidfile=/tmp/supervisord.pid logfile=/dev/null ; nodaemon will cause logs to go to stdout logfile_maxbytes=0 loglevel=error @@ -36,7 +35,7 @@ stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 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] command=/shutdown.sh @@ -44,4 +43,5 @@ events=PROCESS_STATE_STOPPED, PROCESS_STATE_EXITED, PROCESS_STATE_FATAL stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr -stderr_logfile_maxbytes=0 \ No newline at end of file +stderr_logfile_maxbytes=0 +