Merge pull request #823 from aledbf/update-nginx

Release nginx-slim 0.18
kubernetes · Jun 12, 2017 · a5aaf45 · a5aaf45
2 parents ff6b713 + 98454a0
commit a5aaf45
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/images/nginx-slim/Makefile b/images/nginx-slim/Makefile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # 0.0.0 shouldn't clobber any released builds
-TAG = 0.17
+TAG = 0.18
 REGISTRY = gcr.io/google_containers
 ARCH ?= $(shell go env GOARCH)
 ALL_ARCH = amd64 arm ppc64le
@@ -25,7 +25,7 @@ IMAGE = $(REGISTRY)/$(IMGNAME)
 MULTI_ARCH_IMG = $(IMAGE)-$(ARCH)
 
 # Set default base image dynamically for each arch
-BASEIMAGE?=gcr.io/google_containers/ubuntu-slim-$(ARCH):0.10
+BASEIMAGE?=gcr.io/google_containers/ubuntu-slim-$(ARCH):0.11
 
 ifeq ($(ARCH),arm)
         QEMUARCH=arm

diff --git a/images/nginx-slim/build.sh b/images/nginx-slim/build.sh
@@ -17,7 +17,7 @@
 
 set -e
 
-export NGINX_VERSION=1.13.0
+export NGINX_VERSION=1.13.1
 export NDK_VERSION=0.3.0
 export VTS_VERSION=0.1.14
 export SETMISC_VERSION=0.31
@@ -77,7 +77,7 @@ apt-get update && apt-get install --no-install-recommends -y \
   linux-headers-generic || exit 1
 
 # download, verify and extract the source files
-get_src 79f52ab6550f854e14439369808105b5780079769d7b8db3856be03c683605d7 \
+get_src a5856c72a6609a4dc68c88a7f3c33b79e6693343b62952e021e043fe347b6776 \
         "http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz"
 
 get_src 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 \