Skip to content

Commit

Permalink
Test : docker
Browse files Browse the repository at this point in the history
  • Loading branch information
curious-mike-dvc committed Jul 20, 2024
1 parent 25a8962 commit 1764167
Show file tree
Hide file tree
Showing 2 changed files with 12 additions and 9 deletions.
8 changes: 5 additions & 3 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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"]
13 changes: 7 additions & 6 deletions config/supervisord-master.ini
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 1764167

Please sign in to comment.