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

Merge pull request #1640 from aledbf/update-nginx

Browse source 
Update nginx to 0.28 and enable brotli
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-11-02 00:14:42 -03:00 committed by GitHub
commit 21cb993874
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -49,7 +49,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
MULTI_ARCH_IMG = $(IMAGE)-$(ARCH) MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
# Set default base image dynamically for each arch # Set default base image dynamically for each arch
BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-slim-$(ARCH):0.27 BASEIMAGE?=quay.io/kubernetes-ingress-controller/nginx-slim-$(ARCH):0.28
ifeq ($(ARCH),arm) ifeq ($(ARCH),arm)
QEMUARCH=arm QEMUARCH=arm

6
rootfs/etc/nginx/template/nginx.tmpl
View file

@ -114,9 +114,9 @@ http {
default_type text/html; default_type text/html;
{{ if $cfg.UseBrotli }} {{ if $cfg.UseBrotli }}
# brotli on; brotli on;
# brotli_comp_level {{ $cfg.BrotliLevel }}; brotli_comp_level {{ $cfg.BrotliLevel }};
# brotli_types {{ $cfg.BrotliTypes }}; brotli_types {{ $cfg.BrotliTypes }};
{{ end }} {{ end }}
{{ if $cfg.UseGzip }} {{ if $cfg.UseGzip }}