Compare commits

...

4 Commits

Author SHA1 Message Date
David Bomba
3104ec0be9 Merge pull request #276 from turbo124/master
Adjustments for supervisor
2021-01-28 20:18:21 +11:00
David Bomba
acd778f815 Adjustments for supervisor 2021-01-28 20:18:03 +11:00
David Bomba
0641860c3f Merge pull request #275 from turbo124/master
Adjustments for supervisor
2021-01-28 20:09:27 +11:00
David Bomba
f6564ffb14 Adjustments for supervisor 2021-01-28 20:09:11 +11:00
2 changed files with 6 additions and 2 deletions

View File

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

View File

@@ -1,4 +1,5 @@
[supervisord] [supervisord]
process_name=%(program_name)s_%(process_num)02d
nodaemon=true nodaemon=true
user=invoiceninja user=invoiceninja
pidfile=/var/run/supervisord/supervisord.pid pidfile=/var/run/supervisord/supervisord.pid
@@ -7,6 +8,7 @@ logfile_maxbytes=0
loglevel=error loglevel=error
[program:php-fpm] [program:php-fpm]
process_name=%(program_name)s_%(process_num)02d
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
@@ -14,6 +16,7 @@ stderr_logfile_maxbytes=0
command=php-fpm command=php-fpm
[program:scheduler] [program:scheduler]
process_name=%(program_name)s_%(process_num)02d
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr
@@ -21,6 +24,7 @@ stderr_logfile_maxbytes=0
command=php artisan schedule:work command=php artisan schedule:work
[program:queue-worker] [program:queue-worker]
process_name=%(program_name)s_%(process_num)02d
stdout_logfile=/dev/stdout stdout_logfile=/dev/stdout
stdout_logfile_maxbytes=0 stdout_logfile_maxbytes=0
stderr_logfile=/dev/stderr stderr_logfile=/dev/stderr