From a779df8d1b7a82696164db69b1de98e999a52292 Mon Sep 17 00:00:00 2001 From: Zoey Date: Sun, 28 Jan 2024 00:36:05 +0100 Subject: [PATCH] dep updates Signed-off-by: Zoey --- .github/workflows/dependency-updates.yml | 4 ++-- Dockerfile | 6 +++--- README.md | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dependency-updates.yml b/.github/workflows/dependency-updates.yml index a27217ad..29c69025 100644 --- a/.github/workflows/dependency-updates.yml +++ b/.github/workflows/dependency-updates.yml @@ -25,7 +25,7 @@ jobs: sed -i "s|ARG CSNB_VER=.*|ARG CSNB_VER=$CSNB_VER|" Dockerfile echo "version=$CSNB_VER" >> $GITHUB_OUTPUT - name: Create Pull Request - uses: peter-evans/create-pull-request@v5 + uses: peter-evans/create-pull-request@v6 with: signoff: true delete-branch: true @@ -51,7 +51,7 @@ jobs: sed -i "s|ARG CRS_VER=.*|ARG CRS_VER=$CRS_VER|" Dockerfile echo "version=$CRS_VER" >> $GITHUB_OUTPUT - name: Create Pull Request - uses: peter-evans/create-pull-request@v5 + uses: peter-evans/create-pull-request@v6 with: signoff: true delete-branch: true diff --git a/Dockerfile b/Dockerfile index 51619382..b0db40b9 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,14 +48,14 @@ RUN apk add --no-cache ca-certificates git build-base && \ sed -i "s|BAN_TEMPLATE_PATH=.*|BAN_TEMPLATE_PATH=/data/etc/crowdsec/ban.html|g" /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf && \ sed -i "s|CAPTCHA_TEMPLATE_PATH=.*|CAPTCHA_TEMPLATE_PATH=/data/etc/crowdsec/captcha.html|g" /src/crowdsec-nginx-bouncer/lua-mod/config_example.conf -FROM zoeyvid/nginx-quic:247 +FROM zoeyvid/nginx-quic:252 SHELL ["/bin/ash", "-eo", "pipefail", "-c"] ARG CRS_VER=v4.0/dev COPY rootfs / -COPY --from=zoeyvid/certbot-docker:20 /usr/local /usr/local -COPY --from=zoeyvid/curl-quic:367 /usr/local/bin/curl /usr/local/bin/curl +COPY --from=zoeyvid/certbot-docker:21 /usr/local /usr/local +COPY --from=zoeyvid/curl-quic:370 /usr/local/bin/curl /usr/local/bin/curl RUN apk add --no-cache ca-certificates tzdata tini \ patch bash nano \ diff --git a/README.md b/README.md index 3003f542..821fd06e 100644 --- a/README.md +++ b/README.md @@ -185,7 +185,7 @@ Password: iArhP1j7p1P6TA92FA2FMbbUGYqwcYzxC4AVEe12Wbi94FY9gNN62aKyF1shrvG4NycjjX Immediately after logging in with this default user you will be asked to modify your details and change your password. -### prerun patches/scripts (EXPERT option) - if you donÄt know what this is, ignore it +### prerun patches/scripts (EXPERT option) - if you don't know what this is, ignore it run order: entrypoint.sh (patches => scripts) => start.sh => launch.sh
if you need to apply patches before NPMplus launches put them under: `/opt/npm/etc/prerun/patches/*.patch` (applied using `patch -p1`)