From 2ce2cb337d9b349adc5acd531dc4e4e366142c66 Mon Sep 17 00:00:00 2001
From: Jonas Kaninda <jonaskaninda@gmail.com>
Date: Tue, 5 Jul 2022 05:40:09 +0200
Subject: [PATCH] Add custom supervisor conf

---
 Dockerfile    |  4 ++--
 README.md     |  4 ++++
 entrypoint.sh | 23 +++++++++++------------
 3 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index e2b57f5..56df34b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,7 +1,7 @@
 FROM php:7.2-fpm
 ENV WORKDIR=/var/www/html
-ENV STORAGE_DIR=/var/www/html/storage
-ENV LARAVEL_PROCS_NUMBER=2
+ENV STORAGE_DIR=${WORKDIR}/storage
+ENV LARAVEL_PROCS_NUMBER=1
 # Install system dependencies
 RUN apt-get update && apt-get install -y \
     git \
diff --git a/README.md b/README.md
index 6e105d1..a489f8b 100644
--- a/README.md
+++ b/README.md
@@ -165,6 +165,10 @@ volumes:
  docker-compose up -d
 
 ``` 
+## Supervisord
+### Add more supervisor process in
+> /var/www/html/conf/worker/supervisor.conf
+
 
 > P.S. please give a star if you like it :wink:
 
diff --git a/entrypoint.sh b/entrypoint.sh
index 3abd28b..703b13f 100644
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -10,13 +10,9 @@ echo "***********************************************************"
 set -e
 
 ## Create PHP-FPM worker process
-TASK=/etc/supervisor/conf.d/worker.conf
+TASK=/etc/supervisor/conf.d/php-fpm.conf
 touch $TASK
 cat > "$TASK" <<EOF
-[supervisord]
-nodaemon=true
-user=root
-
 [program:php-fpm]
 command=/usr/local/sbin/php-fpm
 numprocs=1
@@ -35,9 +31,6 @@ if [ -f $WORKDIR/artisan ]; then
     TASK=/etc/supervisor/conf.d/laravel-worker.conf
     touch $TASK
     cat > "$TASK" <<EOF
-    [supervisord]
-    nodaemon=true
-    user=root
     [program:Laravel-scheduler]
     process_name=%(program_name)s_%(process_num)02d
     command=/bin/sh -c "while [ true ]; do (php $WORKDIR/artisan schedule:run --verbose --no-interaction &); sleep 60; done"
@@ -72,10 +65,16 @@ echo "Checking if storage directory exists"
 
     else
         echo "${Red} Directory $STORAGE_DIR does not exist"
-        echo "Fixing permissions from $WORKDIR"
-        chown -R www-data:www-data $WORKDIR/storage
-        chmod -R 775 $WORKDIR/storage
-        echo  "${Green}Permissions fixed"
+    fi
+
+    ## Check if the supervisor config file exists
+  if [ -f /var/www/html/conf/worker/supervisor.conf ]; then
+    echo "Custom supervisor config found"
+    cp /var/www/html/conf/worker/supervisor.conf /etc/supervisor/conf.d/supervisor.conf
+    else
+    echo "${Red} Supervisor.conf not found"
+    echo "If you want to add more supervisor configs, create config file in /var/www/html/conf/worker/supervisor.conf"
+    echo "Start supervisor with default config..."
     fi
 
 echo ""