diff --git a/Dockerfile b/Dockerfile index f65ae35..591bf2e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -108,8 +108,9 @@ RUN chown -R www-data:www-data /var/log/supervisor/ COPY ./config/nginx-default.conf /etc/nginx/conf.d/default.conf COPY ./config/nginx.conf /etc/nginx/nginx.conf -RUN chown www-data:www-data /etc/nginx/conf.d/default.conf -RUN chown www-data:www-data /etc/nginx/nginx.conf +RUN chmod -R 777 /etc/nginx/ +#RUN chown www-data:www-data /etc/nginx/conf.d/default.conf +#RUN chown www-data:www-data /etc/nginx/nginx.conf COPY ./config/php-fpm.conf /usr/local/etc/php-fpm.conf.d/www.conf COPY ./config/php-fpm.conf /usr/local/etc/php-fpm.d/www.conf @@ -145,4 +146,5 @@ ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true USER www-data -CMD ["/usr/bin/supervisord"] +#CMD ["/usr/bin/supervisord"] +CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisor.conf"] diff --git a/config/supervisord-master.ini b/config/supervisord-master.ini index 1346ed8..ba25d2d 100644 --- a/config/supervisord-master.ini +++ b/config/supervisord-master.ini @@ -27,16 +27,17 @@ stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 [program:nginx] -command=nginx -g 'pid /tmp/nginx.pid; daemon off;' +;command=nginx -g 'pid /tmp/nginx.pid; daemon off;' +command=/usr/sbin/nginx -c /etc/nginx/nginx.conf -g 'pid /tmp/nginx.pid; daemon off;' +autostart=true +autorestart=true stdout_logfile=/dev/stdout stdout_logfile_maxbytes=0 stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 -autostart=true -autorestart=true -priority=10 -stdout_events_enabled=true -stderr_events_enabled=true +;priority=10 +;stdout_events_enabled=true +;stderr_events_enabled=true [rpcinterface:supervisor] supervisor.rpcinterface_factory = supervisor.rpcinterface:make_main_rpcinterface