mirror of
https://github.com/jkaninda/laravel-php-fpm.git
synced 2026-01-23 15:59:00 +01:00
chore: redirect php-fpm process to supervisor's log, refactoring of code
This commit is contained in:
@@ -92,7 +92,8 @@ RUN groupmod -g ${USER_ID} ${GROUP_NAME}
|
||||
RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /tmp
|
||||
|
||||
EXPOSE 9000
|
||||
CMD [ "entrypoint" ]
|
||||
|
||||
@@ -92,7 +92,8 @@ RUN groupmod -g ${USER_ID} ${GROUP_NAME}
|
||||
RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /tmp
|
||||
|
||||
EXPOSE 9000
|
||||
CMD [ "entrypoint" ]
|
||||
|
||||
@@ -93,7 +93,8 @@ RUN groupmod -g ${USER_ID} ${GROUP_NAME}
|
||||
RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /tmp
|
||||
|
||||
EXPOSE 9000
|
||||
CMD [ "entrypoint" ]
|
||||
|
||||
@@ -93,7 +93,8 @@ RUN groupmod -g ${USER_ID} ${GROUP_NAME}
|
||||
RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /tmp
|
||||
|
||||
EXPOSE 9000
|
||||
CMD [ "entrypoint" ]
|
||||
|
||||
@@ -95,7 +95,8 @@ RUN groupmod -g ${USER_ID} ${GROUP_NAME}
|
||||
RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /tmp
|
||||
|
||||
EXPOSE 9000
|
||||
CMD [ "entrypoint" ]
|
||||
|
||||
@@ -95,7 +95,8 @@ RUN groupmod -g ${USER_ID} ${GROUP_NAME}
|
||||
RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /tmp
|
||||
|
||||
EXPOSE 9000
|
||||
CMD [ "entrypoint" ]
|
||||
|
||||
@@ -96,7 +96,8 @@ RUN groupmod -g ${USER_ID} ${GROUP_NAME}
|
||||
RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /var/log/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /etc/supervisor/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} $PHP_INI_DIR/conf.d/ && \
|
||||
chown -R ${USER_NAME}:${GROUP_NAME} /tmp
|
||||
|
||||
EXPOSE 9000
|
||||
CMD [ "entrypoint" ]
|
||||
|
||||
@@ -51,15 +51,6 @@ else
|
||||
info "artisan file not found"
|
||||
fi
|
||||
|
||||
## Check if the supervisor config file exists
|
||||
if [ -f /var/www/html/conf/worker/supervisor.conf ]; then
|
||||
info "additional supervisor config found"
|
||||
cp /var/www/html/conf/worker/supervisor.conf /etc/supervisor/conf.d/supervisor.conf
|
||||
else
|
||||
info "Supervisor.conf not found"
|
||||
info "If you want to add more supervisor configs, create config file in /var/www/html/conf/worker/supervisor.conf"
|
||||
info "Start supervisor with default config..."
|
||||
fi
|
||||
## Check if php.ini file exists
|
||||
if [ -f /var/www/html/conf/php/php.ini ]; then
|
||||
cp /var/www/html/conf/php/php.ini $PHP_INI_DIR/conf.d/
|
||||
@@ -70,4 +61,3 @@ else
|
||||
fi
|
||||
|
||||
supervisord -c /etc/supervisor/supervisord.conf
|
||||
#exec "$@"
|
||||
@@ -1,16 +1,20 @@
|
||||
[supervisord]
|
||||
nodaemon=true
|
||||
#user=root
|
||||
user=%(ENV_USER_NAME)s
|
||||
logfile=/var/log/supervisor/supervisord.log
|
||||
logfile_maxbytes = 50MB
|
||||
pidfile=/tmp/supervisord.pid
|
||||
directory = /tmp
|
||||
|
||||
[program:php-fpm]
|
||||
command=/usr/local/sbin/php-fpm
|
||||
numprocs=1
|
||||
autostart=true
|
||||
autorestart=true
|
||||
stderr_logfile=/var/log/php-fpm_consumer.err.log
|
||||
stdout_logfile=/var/log/php-fpm_consumer.out.log
|
||||
redirect_stderr=true
|
||||
stdout_logfile=/dev/stdout
|
||||
stderr_logfile=/dev/stdout
|
||||
stdout_logfile_maxbytes=0
|
||||
user=www-data
|
||||
priority=1
|
||||
|
||||
|
||||
Reference in New Issue
Block a user