From f16815e960a4d68847c4d02ef46f94030527214a Mon Sep 17 00:00:00 2001
From: Lee Ween Jiann <lwj5@hotmail.com>
Date: Tue, 23 Mar 2021 23:18:29 +0800
Subject: [PATCH] Updated supervisor files

---
 alpine/Dockerfile_v5               | 5 ++---
 config/shutdown.sh                 | 8 --------
 config/supervisor/shutdown.sh      | 8 ++++++++
 config/supervisor/supervisord.conf | 2 --
 4 files changed, 10 insertions(+), 13 deletions(-)
 delete mode 100644 config/shutdown.sh
 create mode 100644 config/supervisor/shutdown.sh

diff --git a/alpine/Dockerfile_v5 b/alpine/Dockerfile_v5
index 9c9f704..1ed30a2 100644
--- a/alpine/Dockerfile_v5
+++ b/alpine/Dockerfile_v5
@@ -73,7 +73,7 @@ RUN set -eux; \
 
 COPY entrypoint.sh /usr/local/bin/docker-entrypoint
 COPY ./config/php/php.ini /usr/local/etc/php/conf.d/in-php.ini
-COPY ./config/supervisor/supervisord.conf /
+COPY ./config/supervisor/* /
 
 ## Separate user
 ARG UID=1500
@@ -88,8 +88,7 @@ RUN addgroup --gid=$UID -S "$INVOICENINJA_USER" \
     --no-create-home \
     "$INVOICENINJA_USER" \
     && chmod +x /usr/local/bin/docker-entrypoint \
-    && mkdir /app /var/log/supervisord \
-    && chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /app \
+    && chmod +x /shutdown.sh \
     && chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /var/www/app
 
 USER $UID
diff --git a/config/shutdown.sh b/config/shutdown.sh
deleted file mode 100644
index 3edbdf8..0000000
--- a/config/shutdown.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-
-printf "READY\n";
-
-while read line; do
-  echo "Processing Event: $line" >&2;
-  kill -SIGQUIT $PPID
-done < /dev/stdin
\ No newline at end of file
diff --git a/config/supervisor/shutdown.sh b/config/supervisor/shutdown.sh
new file mode 100644
index 0000000..c6171ee
--- /dev/null
+++ b/config/supervisor/shutdown.sh
@@ -0,0 +1,8 @@
+#!/bin/sh
+
+printf "READY\n"
+
+while read line; do
+    echo "Processing Event: $line" >&2
+    kill -SIGQUIT $PPID
+done </dev/stdin
diff --git a/config/supervisor/supervisord.conf b/config/supervisor/supervisord.conf
index efeb566..dc77830 100644
--- a/config/supervisor/supervisord.conf
+++ b/config/supervisor/supervisord.conf
@@ -15,7 +15,6 @@ stderr_logfile_maxbytes=0
 command=php-fpm
 
 [program:scheduler]
-autostart=true
 autorestart=true
 redirect_stderr=true
 stdout_logfile=/dev/stdout
@@ -26,7 +25,6 @@ command=php artisan schedule:work
 
 [program:queue-worker]
 process_name=%(program_name)s_%(process_num)02d
-autostart=true
 autorestart=true
 redirect_stderr=true
 stdout_logfile=/dev/stdout