From 86b0c8e9f4b241c032cc8a34e6f4dde144f42290 Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Tue, 17 Apr 2018 18:48:33 -0300 Subject: [PATCH] Update nginx image to fix modsecurity crs issues --- images/nginx/Makefile | 2 +- images/nginx/build.sh | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/images/nginx/Makefile b/images/nginx/Makefile index 4dbf7f984..7671db35c 100644 --- a/images/nginx/Makefile +++ b/images/nginx/Makefile @@ -13,7 +13,7 @@ # limitations under the License. # 0.0.0 shouldn't clobber any released builds -TAG ?= 0.41 +TAG ?= 0.42 REGISTRY ?= quay.io/kubernetes-ingress-controller ARCH ?= $(shell go env GOARCH) DOCKER ?= gcloud docker -- diff --git a/images/nginx/build.sh b/images/nginx/build.sh index 1eb6b18f0..69918d37e 100755 --- a/images/nginx/build.sh +++ b/images/nginx/build.sh @@ -283,9 +283,9 @@ make install # Download owasp modsecurity crs cd /etc/nginx/ -git clone -b v3.1/dev --single-branch https://github.com/SpiderLabs/owasp-modsecurity-crs +git clone -b v3.0/master --single-branch https://github.com/SpiderLabs/owasp-modsecurity-crs cd owasp-modsecurity-crs -git checkout d7571979b534ae6d9968a6e3582fb4f5212c3586 +git checkout e4e0497be4d598cce0e0a8fef20d1f1e5578c8d0 mv crs-setup.conf.example crs-setup.conf mv rules/REQUEST-900-EXCLUSION-RULES-BEFORE-CRS.conf.example rules/REQUEST-900-EXCLUSION-RULES-BEFORE-CRS.conf