Skip to content

Commit a1f44c5

Browse files
renovate[bot]Zoey2936
authored andcommitted
dep updates/fix healthcheck
Signed-off-by: Zoey <[email protected]>
1 parent dbb0883 commit a1f44c5

File tree

4 files changed

+14
-30
lines changed

4 files changed

+14
-30
lines changed

.gitignore

+3
Original file line numberDiff line numberDiff line change
@@ -784,3 +784,6 @@ node_modules/
784784
*.log
785785
*.sql
786786
*.sqlite
787+
788+
config.php
789+
**/config.php

Dockerfile

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,11 @@ RUN apk upgrade --no-cache -a && \
6767
sed -i "s|BOUNCING_ON_TYPE=all|BOUNCING_ON_TYPE=ban|g" /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf
6868

6969

70-
FROM zoeyvid/nginx-quic:299-python
70+
FROM zoeyvid/nginx-quic:306-python
7171
SHELL ["/bin/ash", "-eo", "pipefail", "-c"]
7272
COPY rootfs /
73-
COPY --from=zoeyvid/certbot-docker:44 /usr/local /usr/local
74-
COPY --from=zoeyvid/curl-quic:404 /usr/local/bin/curl /usr/local/bin/curl
73+
COPY --from=zoeyvid/certbot-docker:46 /usr/local /usr/local
74+
COPY --from=zoeyvid/curl-quic:408 /usr/local/bin/curl /usr/local/bin/curl
7575

7676
ARG CRS_VER=v4.5.0
7777
RUN apk upgrade --no-cache -a && \

backend/package.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
"author": "Jamie Curnow <[email protected]> and ZoeyVid <[email protected]>",
3030
"license": "MIT",
3131
"devDependencies": {
32-
"@eslint/js": "9.8.0",
33-
"eslint": "9.8.0",
32+
"@eslint/js": "9.9.0",
33+
"eslint": "9.9.0",
3434
"eslint-config-prettier": "9.1.0",
3535
"eslint-plugin-prettier": "5.2.1",
3636
"globals": "15.9.0",

rootfs/usr/local/bin/healthcheck.sh

+6-25
Original file line numberDiff line numberDiff line change
@@ -1,34 +1,15 @@
11
#!/bin/sh
22

3-
export HCNPM_IP="localhost"
4-
export HCGOA_IP="localhost"
3+
export HCNPM_IP="$NPM_IPV4_BINDING"
4+
export HCGOA_IP="$GOA_IPV4_BINDING"
55

6-
if [ "$NPM_LISTEN_LOCALHOST" = "true" ]; then
7-
export NPM_IPV4_BINDING="127.0.0.1"
8-
export NPM_IPV6_BINDING="[::1]"
9-
fi
10-
11-
if [ "$NPM_IPV6_BINDING" != "[::]" ] && [ "$NPM_IPV4_BINDING" != "0.0.0.0" ]; then
12-
if [ "$NPM_IPV6_BINDING" != "[::]" ] && [ "$NPM_DISABLE_IPV6" = "false" ]; then
13-
export HCNPM_IP="$NPM_IPV6_BINDING"
14-
fi
15-
if [ "$NPM_IPV4_BINDING" != "0.0.0.0" ]; then
16-
export HCNPM_IP="$NPM_IPV4_BINDING"
17-
fi
18-
fi
196

20-
if [ "$GOA_LISTEN_LOCALHOST" = "true" ]; then
21-
export GOA_IPV4_BINDING="127.0.0.1"
22-
export GOA_IPV6_BINDING="[::1]"
7+
if [ "$NPM_IPV4_BINDING" = "0.0.0.0" ]; then
8+
export HCNPM_IP="127.0.0.1"
239
fi
2410

25-
if [ "$GOA_IPV6_BINDING" != "[::]" ] && [ "$GOA_IPV4_BINDING" != "0.0.0.0" ]; then
26-
if [ "$GOA_IPV6_BINDING" != "[::]" ] && [ "$GOA_DISABLE_IPV6" = "false" ]; then
27-
export HCGOA_IP="$GOA_IPV6_BINDING"
28-
fi
29-
if [ "$NPM_IPV4_BINDING" != "0.0.0.0" ]; then
30-
export HCGOA_IP="$GOA_IPV4_BINDING"
31-
fi
11+
if [ "$GOA_IPV4_BINDING" = "0.0.0.0" ]; then
12+
export HCGOA_IP="127.0.0.1"
3213
fi
3314

3415
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

0 commit comments

Comments
 (0)