diff --git a/src/docker/7.2/Dockerfile b/src/docker/7.2/Dockerfile index 6e525fa..8c1516c 100644 --- a/src/docker/7.2/Dockerfile +++ b/src/docker/7.2/Dockerfile @@ -102,6 +102,7 @@ RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \ chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \ chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \ chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \ + chown -R $USER_NAME:$USER_NAME /etc/nginx/nginx.conf && \ chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \ chown -R ${USER_NAME}:${GROUP_NAME} /tmp diff --git a/src/docker/7.3/Dockerfile b/src/docker/7.3/Dockerfile index dbed050..2a4f567 100644 --- a/src/docker/7.3/Dockerfile +++ b/src/docker/7.3/Dockerfile @@ -103,6 +103,7 @@ RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \ chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \ chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \ chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \ + chown -R $USER_NAME:$USER_NAME /etc/nginx/nginx.conf && \ chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \ chown -R ${USER_NAME}:${GROUP_NAME} /tmp diff --git a/src/docker/7.4/Dockerfile b/src/docker/7.4/Dockerfile index 79268cc..4e0adef 100644 --- a/src/docker/7.4/Dockerfile +++ b/src/docker/7.4/Dockerfile @@ -102,6 +102,7 @@ RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \ chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \ chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \ chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \ + chown -R $USER_NAME:$USER_NAME /etc/nginx/nginx.conf && \ chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \ chown -R ${USER_NAME}:${GROUP_NAME} /tmp diff --git a/src/docker/8.0/Dockerfile b/src/docker/8.0/Dockerfile index d18b0d0..ec0095f 100644 --- a/src/docker/8.0/Dockerfile +++ b/src/docker/8.0/Dockerfile @@ -114,6 +114,7 @@ RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \ chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \ chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \ chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \ + chown -R $USER_NAME:$USER_NAME /etc/nginx/nginx.conf && \ chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \ chown -R ${USER_NAME}:${GROUP_NAME} /tmp diff --git a/src/docker/8.1/Dockerfile b/src/docker/8.1/Dockerfile index 24e88c3..dae6308 100644 --- a/src/docker/8.1/Dockerfile +++ b/src/docker/8.1/Dockerfile @@ -115,6 +115,7 @@ RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \ chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \ chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \ chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \ + chown -R $USER_NAME:$USER_NAME /etc/nginx/nginx.conf && \ chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \ chown -R ${USER_NAME}:${GROUP_NAME} /tmp diff --git a/src/docker/8.2/Dockerfile b/src/docker/8.2/Dockerfile index 99efdf4..6ade464 100644 --- a/src/docker/8.2/Dockerfile +++ b/src/docker/8.2/Dockerfile @@ -113,6 +113,7 @@ RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \ touch /var/run/nginx.pid && \ chown -R $USER_NAME:$USER_NAME /var/cache/nginx && \ chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \ + chown -R $USER_NAME:$USER_NAME /etc/nginx/nginx.conf && \ chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \ chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \ chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \ diff --git a/src/docker/8.3/Dockerfile b/src/docker/8.3/Dockerfile index 051f097..7266796 100644 --- a/src/docker/8.3/Dockerfile +++ b/src/docker/8.3/Dockerfile @@ -116,6 +116,7 @@ RUN chown -R ${USER_NAME}:${GROUP_NAME} /var/www && \ chown -R $USER_NAME:$USER_NAME /var/lib/nginx/ && \ chown -R $USER_NAME:$USER_NAME /var/run/nginx.pid && \ chown -R $USER_NAME:$USER_NAME /var/log/supervisor && \ + chown -R $USER_NAME:$USER_NAME /etc/nginx/nginx.conf && \ chown -R $USER_NAME:$USER_NAME /etc/nginx/conf.d/ && \ chown -R ${USER_NAME}:${GROUP_NAME} /tmp diff --git a/src/entrypoint.sh b/src/entrypoint.sh index aaabcaf..742650f 100644 --- a/src/entrypoint.sh +++ b/src/entrypoint.sh @@ -54,6 +54,21 @@ else info "artisan file not found" fi +# Enable custom nginx config files if they exist +if [ -f /var/www/html/conf/nginx/nginx.conf ]; then + cp /var/www/html/conf/nginx/nginx.conf /etc/nginx/nginx.conf + info "Using custom nginx.conf" +fi + +if [ -f /var/www/html/conf/nginx/nginx-site.conf ]; then + info "Custom nginx site config found" + rm /etc/nginx/conf.d/default.conf + cp /var/www/html/conf/nginx/nginx-site.conf /etc/nginx/conf.d/default.conf + info "Start nginx with custom server config..." + else + info "nginx-site.conf not found" + info "If you want to use custom configs, create config file in /var/www/html/conf/nginx/nginx-site.conf" + info "Start nginx with default config..." rm -f /etc/nginx/conf.d/default.conf TASK=/etc/nginx/conf.d/default.conf touch $TASK @@ -106,6 +121,12 @@ fi location ~ /\.bzr/ {deny all;} } EOF - +fi +## Check if the supervisor config file exists +if [ -f /var/www/html/conf/worker/supervisor.conf ]; then + info "Custom supervisor config found" + cp /var/www/html/conf/worker/supervisor.conf /etc/supervisor/conf.d/supervisor.conf +fi +## Start Supervisord supervisord -c /etc/supervisor/supervisord.conf