diff --git a/Dockerfile b/Dockerfile index f6bfccbea..7d9541d1c 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 @@ -20,7 +20,15 @@ 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 \ + "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