ThatGuyJack/nginx-proxy-manager
1
0
Fork 0
mirror of https://github.com/NginxProxyManager/nginx-proxy-manager.git synced 2025-08-02 23:43:36 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

move php sockets/fix healthcheck/update caddy

Browse Source 
Update caddy Docker tag to v2.7.2

Signed-off-by: Zoey <zoey@z0ey.de>
This commit is contained in:
renovate[bot]
2023-08-04 00:05:39 +00:00
committed by Zoey
parent 991b2c129c
commit c3f47eec65
4 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Caddy.Dockerfile
View File

@@ -1,3 +1,3 @@
FROM caddy:2.6.4 FROM caddy:2.7.2
RUN apk add --no-cache ca-certificates tzdata RUN apk add --no-cache ca-certificates tzdata
COPY Caddyfile /etc/caddy/Caddyfile COPY Caddyfile /etc/caddy/Caddyfile

8
rootfs/bin/healthcheck.sh
View File

@@ -1,17 +1,19 @@
#!/bin/sh #!/bin/sh
export HC_IP="localhost" export HC_IP="localhost"
export NPM_PORT="${NPM_PORT:-81}"
if [ "$NPM_LISTEN_LOCALHOST" = "true" ]; then if [ "$NPM_LISTEN_LOCALHOST" = "true" ]; then
export NPM_IPV4_BINDING="127.0.0.1" export NPM_IPV4_BINDING="127.0.0.1"
export NPM_IPV6_BINDING="[::1]" export NPM_IPV6_BINDING="[::1]"
fi fi
if [ -n "$NPM_IPV6_BINDING" ]; then if [ "$NPM_IPV6_BINDING" != "[::]" ] && [ "$NPM_IPV4_BINDING" != "0.0.0.0" ]; then
if [ "$NPM_IPV6_BINDING" != "[::]" ] && [ "$DISABLE_IPV6" = "false" ]; then
export HC_IP="$NPM_IPV6_BINDING" export HC_IP="$NPM_IPV6_BINDING"
elif [ -n "$NPM_IPV4_BINDING" ]; then fi
if [ "$NPM_IPV4_BINDING" != "0.0.0.0" ]; then
export HC_IP="$NPM_IPV4_BINDING" export HC_IP="$NPM_IPV4_BINDING"
fi
fi fi
if (if [ "$PHP81" = true ]; then cgi-fcgi -bind -connect /dev/php81.sock > /dev/null 2>&1; fi && if [ "$PHP82" = true ]; then cgi-fcgi -bind -connect /dev/php82.sock > /dev/null 2>&1; fi && [ "$(curl -sk https://"$HC_IP":"$NPM_PORT"/api/ | jq --raw-output .status)" = "OK" ]); then if (if [ "$PHP81" = true ]; then cgi-fcgi -bind -connect /dev/php81.sock > /dev/null 2>&1; fi && if [ "$PHP82" = true ]; then cgi-fcgi -bind -connect /dev/php82.sock > /dev/null 2>&1; fi && [ "$(curl -sk https://"$HC_IP":"$NPM_PORT"/api/ | jq --raw-output .status)" = "OK" ]); then

4
rootfs/bin/start.sh
View File

@@ -160,7 +160,7 @@ apk add --no-cache php81-fpm
mkdir -vp /data/php mkdir -vp /data/php
cp -vrnT /etc/php81 /data/php/81 cp -vrnT /etc/php81 /data/php/81
sed -i "s|listen =.*|listen = /var/php81.sock|" /data/php/81/php-fpm.d/www.conf sed -i "s|listen =.*|listen = /var/run/php81.sock|" /data/php/81/php-fpm.d/www.conf
sed -i "s|include=.*|include=/data/php/81/php-fpm.d/*.conf|g" /data/php/81/php-fpm.conf sed -i "s|include=.*|include=/data/php/81/php-fpm.d/*.conf|g" /data/php/81/php-fpm.conf
elif [ "$FULLCLEAN" = "true" ]; then elif [ "$FULLCLEAN" = "true" ]; then
@@ -192,7 +192,7 @@ apk add --no-cache php82-fpm
mkdir -vp /data/php mkdir -vp /data/php
cp -vrnT /etc/php82 /data/php/82 cp -vrnT /etc/php82 /data/php/82
sed -i "s|listen =.*|listen = /var/php82.sock|" /data/php/82/php-fpm.d/www.conf sed -i "s|listen =.*|listen = /var/run/php82.sock|" /data/php/82/php-fpm.d/www.conf
sed -i "s|include=.*|include=/data/php/82/php-fpm.d/*.conf|g" /data/php/82/php-fpm.conf sed -i "s|include=.*|include=/data/php/82/php-fpm.d/*.conf|g" /data/php/82/php-fpm.conf
elif [ "$FULLCLEAN" = "true" ]; then elif [ "$FULLCLEAN" = "true" ]; then

4
rootfs/usr/local/nginx/conf/nginx.conf
View File

@@ -70,11 +70,11 @@ http {
} }
upstream php81 { upstream php81 {
server unix:/var/php81.sock; server unix:/var/run/php81.sock;
} }
upstream php82 { upstream php82 {
server unix:/var/php82.sock; server unix:/var/run/php82.sock;
} }
# Fancy Index # Fancy Index