From 11cdf975bca25bc1d6134b9e7f9bdcb412a7f2e5 Mon Sep 17 00:00:00 2001 From: hackerESQ Date: Sat, 25 Jan 2025 20:40:26 -0600 Subject: [PATCH] wip --- docker/Dockerfile | 6 +----- docker/supervisord.conf | 1 - 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 38608af..2211f37 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -45,10 +45,8 @@ RUN composer install --no-scripts --optimize-autoloader # Install Node dependencies and build assets RUN npm install && npm run build -# Copy the custom Nginx configuration +# Copy over configs COPY ./docker/nginx.conf /etc/nginx/conf.d/default.conf - -# Copy over supervisor configuration COPY ./docker/supervisord.conf /etc/supervisor/conf.d/supervisord.conf # Serve on port 80 @@ -57,8 +55,6 @@ EXPOSE 80 # Set up healthcheck HEALTHCHECK --interval=30s --timeout=10s --retries=3 CMD curl -f http://localhost || exit 1 -USER www-data - # Run everything else ENTRYPOINT ["/bin/bash", "./docker/entrypoint.sh"] CMD ["./docker/entrypoint.sh"] diff --git a/docker/supervisord.conf b/docker/supervisord.conf index b24190e..86aa4b3 100644 --- a/docker/supervisord.conf +++ b/docker/supervisord.conf @@ -1,7 +1,6 @@ [supervisord] nodaemon=true user=root -logfile=/var/log/supervisor/supervisord.log pidfile=/var/run/supervisord.pid [program:nginx]