From 3e6080eb6d821dce84e708c07412cf62aa314856 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 16 Aug 2026 20:35:33 +0000 Subject: [PATCH 1/3] Bundle lua-resty-string with mod due to broken Alpine deps in 3.24 --- Dockerfile | 10 +++++++++- root/etc/s6-overlay/s6-rc.d/init-mod-swag-crowdsec/run | 1 - 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index f6bfccbea..a9aa15e42 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ # syntax=docker/dockerfile:1 -FROM ghcr.io/linuxserver/baseimage-alpine:3.21 AS buildstage +FROM ghcr.io/linuxserver/baseimage-alpine:3.24 AS buildstage ARG MOD_VERSION @@ -21,6 +21,14 @@ RUN \ echo "**** Invalid tarball, could not download crowdsec bouncer ****"; \ exit 1; \ fi + apk add --no-cache build-base + curl -sLo \ + /tmp/resty.tar.gz -L \ + "https://github.com/openresty/lua-resty-string/archive/refs/tags/v0.15.tar.gz" && \ + cd /tmp && \ + tar -xzf ./resty.tar.gz && \ + cd lua-resty-string-0.15 && \ + make DESTDIR=/root-layer LUA_LIB_DIR="/usr/share/lua/common" install COPY root/ /root-layer/ diff --git a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-crowdsec/run b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-crowdsec/run index 9c61ad460..7e596778a 100755 --- a/root/etc/s6-overlay/s6-rc.d/init-mod-swag-crowdsec/run +++ b/root/etc/s6-overlay/s6-rc.d/init-mod-swag-crowdsec/run @@ -23,7 +23,6 @@ echo "\ lua5.1 \ lua5.1-cjson \ lua-resty-http \ - lua-resty-string \ lua-sec \ nginx-mod-http-lua" >> /mod-repo-packages-to-install.list From 6ae6d783f45b61fecbe2d3a03381fe8e5b818535 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 16 Aug 2026 20:39:16 +0000 Subject: [PATCH 2/3] Missing line continuation --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a9aa15e42..d4c770682 100644 --- a/Dockerfile +++ b/Dockerfile @@ -20,7 +20,7 @@ RUN \ if ! tar -tzf /root-layer/crowdsec-nginx-bouncer.tgz >/dev/null 2>&1; then \ echo "**** Invalid tarball, could not download crowdsec bouncer ****"; \ exit 1; \ - fi + fi && \ apk add --no-cache build-base curl -sLo \ /tmp/resty.tar.gz -L \ From f7ea10c918aa6cc8b8b4d49def89463653792578 Mon Sep 17 00:00:00 2001 From: thespad Date: Sun, 16 Aug 2026 20:40:10 +0000 Subject: [PATCH 3/3] All the line continuations --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d4c770682..7d9541d1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -21,7 +21,7 @@ RUN \ echo "**** Invalid tarball, could not download crowdsec bouncer ****"; \ exit 1; \ fi && \ - apk add --no-cache build-base + apk add --no-cache build-base && \ curl -sLo \ /tmp/resty.tar.gz -L \ "https://github.com/openresty/lua-resty-string/archive/refs/tags/v0.15.tar.gz" && \