jkaninda/nginx-php-fpm
1
0
Fork 0
mirror of https://github.com/jkaninda/nginx-php-fpm.git synced 2025-12-06 05:29:43 +01:00
Code Issues Actions Projects Releases Wiki Activity

Merge pull request #28 from jkaninda/develop

Browse Source 
chore: restore nginx custom config that was deleted
This commit is contained in:
Jonas Kaninda
2024-01-26 12:08:05 +01:00
committed by GitHub
parent 74585d88fb 9eb70358d8
commit cdbce2a472
8 changed files with 29 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/docker/7.2/Dockerfile
View File

@@ -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

1
src/docker/7.3/Dockerfile
View File

@@ -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

1
src/docker/7.4/Dockerfile
View File

@@ -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

1
src/docker/8.0/Dockerfile
View File

@@ -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

1
src/docker/8.1/Dockerfile
View File

@@ -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

1
src/docker/8.2/Dockerfile
View File

@@ -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/ && \

1
src/docker/8.3/Dockerfile
View File

@@ -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

23
src/entrypoint.sh
View File

@@ -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