diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile index 5bcf4b0..3f8435a 100644 --- a/.jenkins/Jenkinsfile +++ b/.jenkins/Jenkinsfile @@ -17,7 +17,7 @@ pipeline { BRANCH_LOWER = "${BRANCH_NAME.toLowerCase().replaceAll('/', '-')}" // Software versions; OpenResty does not support Lua >= 5.2 OPENRESTY_VERSION = '1.25.3.2' - CROWDSEC_OPENRESTY_BOUNCER_VERSION = '0.1.7' + CROWDSEC_OPENRESTY_BOUNCER_VERSION = '1.0.2' LUA_VERSION = '5.1.5' LUAROCKS_VERSION = '3.3.1' } diff --git a/docker/Dockerfile b/docker/Dockerfile index 882d97e..6580488 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -91,6 +91,7 @@ RUN apt-get update \ && apt-get install -y gcc make socat git \ && /tmp/install-lua \ && /tmp/install-openresty \ + && /tmp/install-crowdsec_openresty_bouncer \ && apt-get remove -y make gcc git wget gettext \ && apt-get autoremove -y \ && apt-get clean \ diff --git a/local-build.sh b/local-build.sh index 4b1e94e..302d2c9 100755 --- a/local-build.sh +++ b/local-build.sh @@ -10,7 +10,7 @@ REGISTRY=${REGISTRY:-} DOCKER_IMAGE="${REGISTRY}nginxproxymanager/nginx-full" export OPENRESTY_VERSION=1.25.3.2 -export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.7 +export CROWDSEC_OPENRESTY_BOUNCER_VERSION=1.0.2 export LUA_VERSION=5.1.5 export LUAROCKS_VERSION=3.3.1 diff --git a/local-buildx.sh b/local-buildx.sh index dbf2862..9c05e4f 100755 --- a/local-buildx.sh +++ b/local-buildx.sh @@ -10,7 +10,8 @@ DOCKER_IMAGE="${REGISTRY:-}nginxproxymanager/nginx-full" PLATFORMS=linux/amd64,linux/arm64,linux/arm/7 export OPENRESTY_VERSION=1.25.3.2 -export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.7 +export CROWDSEC_OPENRESTY_BOUNCER_VERSION=1.0.2 + export LUA_VERSION=5.1.5 export LUAROCKS_VERSION=3.3.1 diff --git a/scripts/install-crowdsec_openresty_bouncer b/scripts/install-crowdsec_openresty_bouncer index 2448f58..3649f9b 100755 --- a/scripts/install-crowdsec_openresty_bouncer +++ b/scripts/install-crowdsec_openresty_bouncer @@ -21,7 +21,7 @@ tar xzf crowdsec-openresty-bouncer.tgz --strip 1 -C /tmp/crowdsec rm -rf /tmp/crowdsec-openresty-bouncer.tgz cd /tmp/crowdsec -bash ./install.sh --NGINX_CONF_DIR=/etc/nginx/conf.d --LIB_PATH=/etc/nginx/lualib --CONFIG_PATH=/defaults/crowdsec --DATA_PATH=/defaults/crowdsec --docker +bash ./install.sh --NGINX_CONF_DIR=/etc/nginx/conf.d --LIB_PATH=/etc/nginx/lualib --CONFIG_PATH=/defaults/crowdsec --DATA_PATH=/defaults/crowdsec --SSL_CERTS_PATH=/etc/ssl/certs/GTS_Root_R1.pem --docker sed -i 's|ENABLED=.*|ENABLED=false|' /defaults/crowdsec/crowdsec-openresty-bouncer.conf rm -rf /tmp/crowdsec