Merge pull request #278 from turbo124/master

fix for defaults of supervisor

alpine/Dockerfile_v5

@@ -28,9 +28,7 @@ RUN npm install --production \
     && npm run production \
     && rm -rf node_modules \
     && mv /var/www/app/storage $BAK_STORAGE_PATH \
-    && mv /var/www/app/public $BAK_PUBLIC_PATH \
+    && mv /var/www/app/public $BAK_PUBLIC_PATH  
-    && mkdir /var/log/supervisord /var/run/supervisord \
-    && chown $INVOICENINJA_USER:www-data /var/log/supervisord /var/run/supervisord
 
 # Prepare php image
 FROM php:${PHP_VERSION}-fpm-alpine
@@ -90,7 +88,9 @@ RUN addgroup --gid=$UID -S "$INVOICENINJA_USER" \
     --no-create-home \
     "$INVOICENINJA_USER" \
     && addgroup "$INVOICENINJA_USER" www-data \
-    && chown -R "$INVOICENINJA_USER":"$INVOICENINJA_USER" /var/www/app
+    && 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
 
 USER $UID
 

config/supervisor/supervisord.conf

@@ -1,4 +1,5 @@
 [supervisord]
+process_name=%(program_name)s_%(process_num)02d
 nodaemon=true
 user=invoiceninja
 pidfile=/var/run/supervisord/supervisord.pid
@@ -7,6 +8,10 @@ logfile_maxbytes=0
 loglevel=error
 
 [program:php-fpm]
+process_name=%(program_name)s_%(process_num)02d
+autostart=true
+autorestart=true
+redirect_stderr=true
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
@@ -14,6 +19,10 @@ stderr_logfile_maxbytes=0
 command=php-fpm
 
 [program:scheduler]
+process_name=%(program_name)s_%(process_num)02d
+autostart=true
+autorestart=true
+redirect_stderr=true
 stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
@@ -21,9 +30,13 @@ stderr_logfile_maxbytes=0
 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
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
 numprocs=2
-command=php artisan queue:work --sleep=3 --tries=1 --memory=1024 --timeout=3600 --daemon
+command=php artisan queue:work --sleep=3 --tries=1 --memory=256 --timeout=3600 --daemon