Fabio/nginx-proxy-manager
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

dep updates/fix healthcheck

Browse source 
Signed-off-by: Zoey <zoey@z0ey.de>
This commit is contained in:
renovate[bot] 2024-08-07 18:51:59 +00:00 committed by Zoey
parent dbb0883dd7
commit a1f44c57d1
No known key found for this signature in database
GPG key ID: 02A3919EB4F67328
4 changed files with 15 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitignore vendored
View file

@ -784,3 +784,6 @@ node_modules/
*.log *.log
*.sql *.sql
*.sqlite *.sqlite
config.php
**/config.php

6
Dockerfile
View file

@ -67,11 +67,11 @@ RUN apk upgrade --no-cache -a && \
sed -i "s|BOUNCING_ON_TYPE=all|BOUNCING_ON_TYPE=ban|g" /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf sed -i "s|BOUNCING_ON_TYPE=all|BOUNCING_ON_TYPE=ban|g" /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf
FROM zoeyvid/nginx-quic:299-python FROM zoeyvid/nginx-quic:306-python
SHELL ["/bin/ash", "-eo", "pipefail", "-c"] SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
COPY rootfs / COPY rootfs /
COPY --from=zoeyvid/certbot-docker:44 /usr/local /usr/local COPY --from=zoeyvid/certbot-docker:46 /usr/local /usr/local
COPY --from=zoeyvid/curl-quic:404 /usr/local/bin/curl /usr/local/bin/curl COPY --from=zoeyvid/curl-quic:408 /usr/local/bin/curl /usr/local/bin/curl
ARG CRS_VER=v4.5.0 ARG CRS_VER=v4.5.0
RUN apk upgrade --no-cache -a && \ RUN apk upgrade --no-cache -a && \

4
backend/package.json
View file

@ -29,8 +29,8 @@
"author": "Jamie Curnow <jc@jc21.com> and ZoeyVid <zoeyvid@zvcdn.de>", "author": "Jamie Curnow <jc@jc21.com> and ZoeyVid <zoeyvid@zvcdn.de>",
"license": "MIT", "license": "MIT",
"devDependencies": { "devDependencies": {
"@eslint/js": "9.8.0", "@eslint/js": "9.9.0",
"eslint": "9.8.0", "eslint": "9.9.0",
"eslint-config-prettier": "9.1.0", "eslint-config-prettier": "9.1.0",
"eslint-plugin-prettier": "5.2.1", "eslint-plugin-prettier": "5.2.1",
"globals": "15.9.0", "globals": "15.9.0",

33
rootfs/usr/local/bin/healthcheck.sh
View file

@ -1,34 +1,15 @@
#!/bin/sh #!/bin/sh
export HCNPM_IP="localhost" export HCNPM_IP="$NPM_IPV4_BINDING"
export HCGOA_IP="localhost" export HCGOA_IP="$GOA_IPV4_BINDING"
if [ "$NPM_LISTEN_LOCALHOST" = "true" ]; then
export NPM_IPV4_BINDING="127.0.0.1" if [ "$NPM_IPV4_BINDING" = "0.0.0.0" ]; then
export NPM_IPV6_BINDING="[::1]" export HCNPM_IP="127.0.0.1"
fi fi
if [ "$NPM_IPV6_BINDING" != "[::]" ] && [ "$NPM_IPV4_BINDING" != "0.0.0.0" ]; then if [ "$GOA_IPV4_BINDING" = "0.0.0.0" ]; then
if [ "$NPM_IPV6_BINDING" != "[::]" ] && [ "$NPM_DISABLE_IPV6" = "false" ]; then export HCGOA_IP="127.0.0.1"
export HCNPM_IP="$NPM_IPV6_BINDING"
fi
if [ "$NPM_IPV4_BINDING" != "0.0.0.0" ]; then
export HCNPM_IP="$NPM_IPV4_BINDING"
fi
fi
if [ "$GOA_LISTEN_LOCALHOST" = "true" ]; then
export GOA_IPV4_BINDING="127.0.0.1"
export GOA_IPV6_BINDING="[::1]"
fi
if [ "$GOA_IPV6_BINDING" != "[::]" ] && [ "$GOA_IPV4_BINDING" != "0.0.0.0" ]; then
if [ "$GOA_IPV6_BINDING" != "[::]" ] && [ "$GOA_DISABLE_IPV6" = "false" ]; then
export HCGOA_IP="$GOA_IPV6_BINDING"
fi
if [ "$NPM_IPV4_BINDING" != "0.0.0.0" ]; then
export HCGOA_IP="$GOA_IPV4_BINDING"
fi
fi fi
if (if [ "$GOA" = "true" ]; then [ -f /tmp/goa/index.html ] && nc -z "$HCGOA_IP" "$GOA_PORT"; fi && if [ "$PHP82" = true ]; then cgi-fcgi -bind -connect /run/php82.sock > /dev/null 2>&1; fi && if [ "$PHP83" = true ]; then cgi-fcgi -bind -connect /run/php83.sock > /dev/null 2>&1; fi && [ "$(curl -sk https://"$HCNPM_IP":"$NPM_PORT"/api/ | jq --raw-output .status)" = "OK" ]); then if (if [ "$GOA" = "true" ]; then [ -f /tmp/goa/index.html ] && nc -z "$HCGOA_IP" "$GOA_PORT"; fi && if [ "$PHP82" = true ]; then cgi-fcgi -bind -connect /run/php82.sock > /dev/null 2>&1; fi && if [ "$PHP83" = true ]; then cgi-fcgi -bind -connect /run/php83.sock > /dev/null 2>&1; fi && [ "$(curl -sk https://"$HCNPM_IP":"$NPM_PORT"/api/ | jq --raw-output .status)" = "OK" ]); then