Merge pull request kubernetes#289 from aledbf/update-nginx-slim

[nginx-slim] Update nginx-slim to 1.11.10
dmyerscough · Feb 17, 2017 · 477c1ba · 477c1ba
2 parents 3b92315 + a7b6c70
commit 477c1ba
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/images/nginx-slim/Dockerfile b/images/nginx-slim/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 
-FROM gcr.io/google_containers/ubuntu-slim:0.6
+FROM gcr.io/google_containers/ubuntu-slim:0.7
 
 COPY build.sh /tmp
 

diff --git a/images/nginx-slim/Makefile b/images/nginx-slim/Makefile
@@ -1,7 +1,7 @@
 all: push
 
 # 0.0.0 shouldn't clobber any released builds
-TAG = 0.13
+TAG = 0.14
 PREFIX = gcr.io/google_containers/nginx-slim
 
 container:

diff --git a/images/nginx-slim/build.sh b/images/nginx-slim/build.sh
@@ -17,7 +17,7 @@
 
 set -e
 
-export NGINX_VERSION=1.11.9
+export NGINX_VERSION=1.11.10
 export NDK_VERSION=0.3.0
 export VTS_VERSION=0.1.11
 export SETMISC_VERSION=0.31
@@ -69,7 +69,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 dc22b71f16b551705930544dc042f1ad1af2f9715f565187ec22c7a4b2625748 \
+get_src 778b3cabb07633f754cd9dee32fc8e22582bce22bfa407be76a806abd935533d \
         "http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz"
 
 get_src 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 \