diff --git a/Dockerfile b/Dockerfile index a2751a4..b107057 100644 --- a/Dockerfile +++ b/Dockerfile @@ -47,7 +47,7 @@ RUN groupadd --force -g 1000 octane && useradd -ms /bin/bash --no-log-init --no- WORKDIR /app RUN chown -R octane:octane . EXPOSE 80 -COPY ./supervisord.conf /etc/supervisord.conf +COPY ./supervisord.conf /etc/supervisor/octane.conf COPY ./entrypoint.sh /etc/entrypoint.sh ENTRYPOINT ["/etc/entrypoint.sh"] -HEALTHCHECK --start-period=5s --interval=2s --timeout=5s --retries=8 CMD php artisan octane:status || exit 1 +HEALTHCHECK --start-period=30s --interval=30s --timeout=5s --retries=8 CMD php artisan octane:status || exit 1 diff --git a/entrypoint.sh b/entrypoint.sh index 829d49b..f77646a 100755 --- a/entrypoint.sh +++ b/entrypoint.sh @@ -5,4 +5,4 @@ php artisan package:discover --ansi php artisan event:cache php artisan config:cache php artisan route:cache -exec supervisord --configuration /etc/supervisord.conf +exec supervisord --configuration /etc/supervisor/octane.conf diff --git a/supervisord.conf b/supervisord.conf index 83ade5f..1a8ce4c 100644 --- a/supervisord.conf +++ b/supervisord.conf @@ -18,4 +18,4 @@ stderr_logfile=/dev/stderr stderr_logfile_maxbytes=0 [include] -files = /etc/supervisor.conf +files = /etc/supervisor/conf.d/*.conf