From e7d6e06f40392c684b4c071011c82a361d8472a3 Mon Sep 17 00:00:00 2001 From: LePresidente Date: Sat, 20 Jan 2024 09:46:37 +0200 Subject: [PATCH 1/3] Readded Crowdsec to image. --- .jenkins/Jenkinsfile | 2 +- docker/Dockerfile | 1 + local-build.sh | 2 +- scripts/install-crowdsec_openresty_bouncer | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile index 7721f2e..4e8c673 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.21.4.3' - CROWDSEC_OPENRESTY_BOUNCER_VERSION = '0.1.7' + CROWDSEC_OPENRESTY_BOUNCER_VERSION = '1.0.0' LUA_VERSION = '5.1.5' LUAROCKS_VERSION = '3.3.1' } diff --git a/docker/Dockerfile b/docker/Dockerfile index f3848e8..2b2f0df 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -89,6 +89,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 b429cf8..901be75 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.21.4.3 -export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.7 +export CROWDSEC_OPENRESTY_BOUNCER_VERSION=1.0.0 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 From 4135984db83c7ef03337cf617920f20ba5589188 Mon Sep 17 00:00:00 2001 From: Brian Munro Date: Thu, 25 Jan 2024 13:44:34 +0200 Subject: [PATCH 2/3] Update Crowdsec Bouncer to 1.0.1 --- .jenkins/Jenkinsfile | 2 +- local-build.sh | 2 +- local-buildx.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile index 4e8c673..ccc0874 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.21.4.3' - CROWDSEC_OPENRESTY_BOUNCER_VERSION = '1.0.0' + CROWDSEC_OPENRESTY_BOUNCER_VERSION = '1.0.1' LUA_VERSION = '5.1.5' LUAROCKS_VERSION = '3.3.1' } diff --git a/local-build.sh b/local-build.sh index 901be75..b5a7506 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.21.4.3 -export CROWDSEC_OPENRESTY_BOUNCER_VERSION=1.0.0 +export CROWDSEC_OPENRESTY_BOUNCER_VERSION=1.0.1 export LUA_VERSION=5.1.5 export LUAROCKS_VERSION=3.3.1 diff --git a/local-buildx.sh b/local-buildx.sh index a6be260..69ddaa6 100755 --- a/local-buildx.sh +++ b/local-buildx.sh @@ -11,7 +11,7 @@ DOCKER_IMAGE="${REGISTRY}jc21/nginx-full" PLATFORMS=linux/amd64,linux/arm64,linux/arm/7 export OPENRESTY_VERSION=1.21.4.3 -export CROWDSEC_OPENRESTY_BOUNCER_VERSION=0.1.7 +export CROWDSEC_OPENRESTY_BOUNCER_VERSION=1.0.1 export LUA_VERSION=5.1.5 export LUAROCKS_VERSION=3.3.1 From 26622fbbf10677f78d16826c2abfc12ac7d2b9cc Mon Sep 17 00:00:00 2001 From: LePresidente Date: Sat, 10 Feb 2024 09:31:56 +0200 Subject: [PATCH 3/3] Update Crowdsec Bouncer to 1.0.2 --- .jenkins/Jenkinsfile | 2 +- local-build.sh | 2 +- local-buildx.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.jenkins/Jenkinsfile b/.jenkins/Jenkinsfile index ccc0874..d948f78 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.21.4.3' - CROWDSEC_OPENRESTY_BOUNCER_VERSION = '1.0.1' + CROWDSEC_OPENRESTY_BOUNCER_VERSION = '1.0.2' LUA_VERSION = '5.1.5' LUAROCKS_VERSION = '3.3.1' } diff --git a/local-build.sh b/local-build.sh index b5a7506..8f467ac 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.21.4.3 -export CROWDSEC_OPENRESTY_BOUNCER_VERSION=1.0.1 +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 69ddaa6..35e3777 100755 --- a/local-buildx.sh +++ b/local-buildx.sh @@ -11,7 +11,7 @@ DOCKER_IMAGE="${REGISTRY}jc21/nginx-full" PLATFORMS=linux/amd64,linux/arm64,linux/arm/7 export OPENRESTY_VERSION=1.21.4.3 -export CROWDSEC_OPENRESTY_BOUNCER_VERSION=1.0.1 +export CROWDSEC_OPENRESTY_BOUNCER_VERSION=1.0.2 export LUA_VERSION=5.1.5 export LUAROCKS_VERSION=3.3.1