Merge pull request #275 from turbo124/master

Adjustments for supervisor

alpine/Dockerfile_v5

@@ -28,7 +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  
 
 # Prepare php image
 FROM php:${PHP_VERSION}-fpm-alpine
@@ -66,12 +66,14 @@ RUN install-php-extensions \
 # Install chromium
 RUN set -eux; \
     apk add --no-cache \
+    supervisor \
     mysql-client \
     git \
     chromium \
     ttf-freefont
 
 COPY ./config/php/php.ini /usr/local/etc/php/conf.d/in-php.ini
+COPY ./config/supervisor/supervisord.conf /
 
 ## Separate user
 ARG UID=1500
@@ -86,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
 
@@ -98,4 +102,4 @@ ENV LOG errorlog
 ENV SNAPPDF_EXECUTABLE_PATH /usr/bin/chromium-browser
 
 ENTRYPOINT ["docker-entrypoint"]
-CMD ["php-fpm"]
+CMD ["/usr/bin/supervisord", "-c", "/supervisord.conf"]

config/supervisor/supervisord.conf

@@ -0,0 +1,29 @@
+[supervisord]
+nodaemon=true
+user=invoiceninja
+pidfile=/var/run/supervisord/supervisord.pid
+logfile=/dev/null ; nodaemon will cause logs to go to stdout
+logfile_maxbytes=0
+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
+numprocs=2
+command=php artisan queue:work --sleep=3 --tries=1 --memory=1024 --timeout=3600 --daemon

examples/v5/supervisor/supervisord.conf

@@ -25,4 +25,5 @@ stdout_logfile=/dev/stdout
 stdout_logfile_maxbytes=0
 stderr_logfile=/dev/stderr
 stderr_logfile_maxbytes=0
-command=php artisan queue:listen
+numprocs=2
+command=php artisan queue:work --sleep=3 --tries=1 --memory=1024 --timeout=3600 --daemon