From a1f44c57d1cd8fa1a2a2639e02a588f4941336f8 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 7 Aug 2024 18:51:59 +0000 Subject: [PATCH] dep updates/fix healthcheck Signed-off-by: Zoey --- .gitignore | 3 +++ Dockerfile | 6 +++--- backend/package.json | 4 ++-- rootfs/usr/local/bin/healthcheck.sh | 33 ++++++----------------------- 4 files changed, 15 insertions(+), 31 deletions(-) diff --git a/.gitignore b/.gitignore index 089a3113..140555f0 100644 --- a/.gitignore +++ b/.gitignore @@ -784,3 +784,6 @@ node_modules/ *.log *.sql *.sqlite + +config.php +**/config.php diff --git a/Dockerfile b/Dockerfile index ad20a343..2b8f24f8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -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 -FROM zoeyvid/nginx-quic:299-python +FROM zoeyvid/nginx-quic:306-python SHELL ["/bin/ash", "-eo", "pipefail", "-c"] COPY rootfs / -COPY --from=zoeyvid/certbot-docker:44 /usr/local /usr/local -COPY --from=zoeyvid/curl-quic:404 /usr/local/bin/curl /usr/local/bin/curl +COPY --from=zoeyvid/certbot-docker:46 /usr/local /usr/local +COPY --from=zoeyvid/curl-quic:408 /usr/local/bin/curl /usr/local/bin/curl ARG CRS_VER=v4.5.0 RUN apk upgrade --no-cache -a && \ diff --git a/backend/package.json b/backend/package.json index 50d34044..4dc0c572 100644 --- a/backend/package.json +++ b/backend/package.json @@ -29,8 +29,8 @@ "author": "Jamie Curnow and ZoeyVid ", "license": "MIT", "devDependencies": { - "@eslint/js": "9.8.0", - "eslint": "9.8.0", + "@eslint/js": "9.9.0", + "eslint": "9.9.0", "eslint-config-prettier": "9.1.0", "eslint-plugin-prettier": "5.2.1", "globals": "15.9.0", diff --git a/rootfs/usr/local/bin/healthcheck.sh b/rootfs/usr/local/bin/healthcheck.sh index 6cd3d327..35f7cd89 100755 --- a/rootfs/usr/local/bin/healthcheck.sh +++ b/rootfs/usr/local/bin/healthcheck.sh @@ -1,34 +1,15 @@ #!/bin/sh -export HCNPM_IP="localhost" -export HCGOA_IP="localhost" +export HCNPM_IP="$NPM_IPV4_BINDING" +export HCGOA_IP="$GOA_IPV4_BINDING" -if [ "$NPM_LISTEN_LOCALHOST" = "true" ]; then - export NPM_IPV4_BINDING="127.0.0.1" - export NPM_IPV6_BINDING="[::1]" + +if [ "$NPM_IPV4_BINDING" = "0.0.0.0" ]; then + export HCNPM_IP="127.0.0.1" fi -if [ "$NPM_IPV6_BINDING" != "[::]" ] && [ "$NPM_IPV4_BINDING" != "0.0.0.0" ]; then - if [ "$NPM_IPV6_BINDING" != "[::]" ] && [ "$NPM_DISABLE_IPV6" = "false" ]; then - 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 +if [ "$GOA_IPV4_BINDING" = "0.0.0.0" ]; then + export HCGOA_IP="127.0.0.1" 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