From f9f79ceb2132c97d5a89da621de83ab4e549cef0 Mon Sep 17 00:00:00 2001
From: Valentin Day <valentin.day@colibris.xyz>
Date: Thu, 28 Jan 2021 11:11:24 +0100
Subject: [PATCH] Cleanup supervisor conf

---
 alpine/Dockerfile_v5               | 6 ++----
 config/supervisor/supervisord.conf | 5 ++---
 2 files changed, 4 insertions(+), 7 deletions(-)

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 ea7ccb0..d93f8e9 100644
--- a/config/supervisor/supervisord.conf
+++ b/config/supervisor/supervisord.conf
@@ -1,8 +1,7 @@
 [supervisord]
 process_name=%(program_name)s_%(process_num)02d
 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
@@ -39,4 +38,4 @@ stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 numprocs=2
-command=php artisan queue:work --sleep=3 --tries=1 --memory=256 --timeout=3600 --daemon
\ No newline at end of file
+command=php artisan queue:work --sleep=3 --tries=1 --memory=256 --timeout=3600 --daemon