DevFW-CICD/ingress-nginx-helm
16
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update nginx modules (#3353)

Browse source
This commit is contained in:
Manuel Alejandro de Brito Fontes 2018-11-03 19:29:07 -03:00 committed by GitHub
parent 1f76acfa6a
commit 1978bed594
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
images/nginx/Makefile
View file

@ -13,7 +13,7 @@
# limitations under the License. # limitations under the License.
# 0.0.0 shouldn't clobber any released builds # 0.0.0 shouldn't clobber any released builds
TAG ?= 0.66 TAG ?= 0.67
REGISTRY ?= quay.io/kubernetes-ingress-controller REGISTRY ?= quay.io/kubernetes-ingress-controller
ARCH ?= $(shell go env GOARCH) ARCH ?= $(shell go env GOARCH)
DOCKER ?= docker DOCKER ?= docker

4
images/nginx/rootfs/build.sh
View file

@ -413,7 +413,7 @@ git submodule update
cd "$BUILD_PATH" cd "$BUILD_PATH"
git clone -b v3/master --single-branch https://github.com/SpiderLabs/ModSecurity git clone -b v3/master --single-branch https://github.com/SpiderLabs/ModSecurity
cd ModSecurity/ cd ModSecurity/
git checkout 973c1f1028429452308bcbce7df8a6283dc59ffe git checkout 9ada0a28c8100f905014c128b0e6d11dd75ec7e5
git submodule init git submodule init
git submodule update git submodule update
sh build.sh sh build.sh
@ -425,7 +425,7 @@ make install
cd /etc/nginx/ cd /etc/nginx/
git clone -b v3.0/master --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 cd owasp-modsecurity-crs
git checkout e4e0497be4d598cce0e0a8fef20d1f1e5578c8d0 git checkout a216353c97dd6ef767a6db4dbf9b724627811c9b
mv crs-setup.conf.example crs-setup.conf 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 mv rules/REQUEST-900-EXCLUSION-RULES-BEFORE-CRS.conf.example rules/REQUEST-900-EXCLUSION-RULES-BEFORE-CRS.conf