From 49d3e562de469d8345a731f5573213eb73b057d9 Mon Sep 17 00:00:00 2001
From: Valentin Day <valentin.day@colibris.xyz>
Date: Wed, 27 Jan 2021 15:30:14 +0100
Subject: [PATCH 1/3] Add example to run php-fpm, scheduler and queue worker in
 the same container with supervisor

---
 v5/supervisor/Dockerfile       | 13 +++++++++++++
 v5/supervisor/supervisord.conf | 30 ++++++++++++++++++++++++++++++
 2 files changed, 43 insertions(+)
 create mode 100644 v5/supervisor/Dockerfile
 create mode 100644 v5/supervisor/supervisord.conf

diff --git a/v5/supervisor/Dockerfile b/v5/supervisor/Dockerfile
new file mode 100644
index 0000000..86c412a
--- /dev/null
+++ b/v5/supervisor/Dockerfile
@@ -0,0 +1,13 @@
+FROM invoiceninja/invoiceninja:5
+
+USER root
+
+RUN apk add --no-cache supervisor \
+  && mkdir /var/log/supervisord /var/run/supervisord \
+  && chown $INVOICENINJA_USER:www-data /var/log/supervisord /var/run/supervisord
+
+COPY supervisord.conf /
+
+USER $INVOICENINJA_USER
+
+CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]
diff --git a/v5/supervisor/supervisord.conf b/v5/supervisor/supervisord.conf
new file mode 100644
index 0000000..f8fda83
--- /dev/null
+++ b/v5/supervisor/supervisord.conf
@@ -0,0 +1,30 @@
+[supervisord]
+nodaemon=true
+user=invoiceninja
+logfile=/var/log/supervisord/supervisord.log
+pidfile=/var/run/supervisord/supervisord.pid
+childlogdir=/var/log/supervisord/
+logfile_maxbytes=50MB                           ; maximum size of logfile before rotation
+logfile_backups=10                              ; number of backed up logfiles
+loglevel=error
+
+[program:php-fpm]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=php-fpm
+
+[program:scheduler]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=php artisan schedule:work
+
+[program:queue-worker]
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+command=php artisan queue:listen

From a67de32b6e8c011214b55b8f42cb8920598f408e Mon Sep 17 00:00:00 2001
From: Valentin Day <valentin.day@colibris.xyz>
Date: Wed, 27 Jan 2021 15:43:45 +0100
Subject: [PATCH 2/3] Move supervisor example into an examples folder

---
 {v5 => examples/v5}/supervisor/Dockerfile       | 0
 {v5 => examples/v5}/supervisor/supervisord.conf | 0
 2 files changed, 0 insertions(+), 0 deletions(-)
 rename {v5 => examples/v5}/supervisor/Dockerfile (100%)
 rename {v5 => examples/v5}/supervisor/supervisord.conf (100%)

diff --git a/v5/supervisor/Dockerfile b/examples/v5/supervisor/Dockerfile
similarity index 100%
rename from v5/supervisor/Dockerfile
rename to examples/v5/supervisor/Dockerfile
diff --git a/v5/supervisor/supervisord.conf b/examples/v5/supervisor/supervisord.conf
similarity index 100%
rename from v5/supervisor/supervisord.conf
rename to examples/v5/supervisor/supervisord.conf

From 758709a7969e433932cd71c41ac95fec9048456a Mon Sep 17 00:00:00 2001
From: Valentin Day <valentin.day@colibris.xyz>
Date: Thu, 28 Jan 2021 09:05:50 +0100
Subject: [PATCH 3/3] Change supervisord logging options

---
 examples/v5/supervisor/supervisord.conf | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/examples/v5/supervisor/supervisord.conf b/examples/v5/supervisor/supervisord.conf
index f8fda83..0bd7ad3 100644
--- a/examples/v5/supervisor/supervisord.conf
+++ b/examples/v5/supervisor/supervisord.conf
@@ -1,11 +1,9 @@
 [supervisord]
 nodaemon=true
 user=invoiceninja
-logfile=/var/log/supervisord/supervisord.log
 pidfile=/var/run/supervisord/supervisord.pid
-childlogdir=/var/log/supervisord/
-logfile_maxbytes=50MB                           ; maximum size of logfile before rotation
-logfile_backups=10                              ; number of backed up logfiles
+logfile=/dev/null ; nodaemon will cause logs to go to stdout
+logfile_maxbytes=0
 loglevel=error
 
 [program:php-fpm]