From 5115adef821a9821a164dee214124aa9045c972b Mon Sep 17 00:00:00 2001 From: Manuel de Brito Fontes Date: Wed, 1 Nov 2017 22:54:22 -0300 Subject: [PATCH] Update nginx to 0.28 and enable brotli --- Makefile | 2 +- rootfs/etc/nginx/template/nginx.tmpl | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 3dcac846c..314053bf2 100644 --- a/Makefile +++ b/Makefile @@ -49,7 +49,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME) MULTI_ARCH_IMG = $(IMAGE)-$(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) QEMUARCH=arm diff --git a/rootfs/etc/nginx/template/nginx.tmpl b/rootfs/etc/nginx/template/nginx.tmpl index 7ac74b351..11ac53690 100644 --- a/rootfs/etc/nginx/template/nginx.tmpl +++ b/rootfs/etc/nginx/template/nginx.tmpl @@ -114,9 +114,9 @@ http { default_type text/html; {{ if $cfg.UseBrotli }} -# brotli on; -# brotli_comp_level {{ $cfg.BrotliLevel }}; -# brotli_types {{ $cfg.BrotliTypes }}; + brotli on; + brotli_comp_level {{ $cfg.BrotliLevel }}; + brotli_types {{ $cfg.BrotliTypes }}; {{ end }} {{ if $cfg.UseGzip }}