Merge pull request #915 from aledbf/update-nginx

Release nginx-slim 0.20
kubernetes · Jun 28, 2017 · 63310e0 · 63310e0
2 parents ed675fd + e7fc9a5
commit 63310e0
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 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.19
+TAG = 0.20
 REGISTRY = gcr.io/google_containers
 ARCH ?= $(shell go env GOARCH)
 ALL_ARCH = amd64 arm ppc64le

diff --git a/images/nginx-slim/README.md b/images/nginx-slim/README.md
@@ -15,7 +15,7 @@ This image does provides a default configuration file with no backend servers.
 
 *Using docker*
 ```
-$ docker run -v /some/nginx.con:/etc/nginx/nginx.conf:ro gcr.io/google_containers/nginx-slim:0.19
+$ docker run -v /some/nginx.con:/etc/nginx/nginx.conf:ro gcr.io/google_containers/nginx-slim:0.20
 ```
 
 *Creating a replication controller*

diff --git a/images/nginx-slim/build.sh b/images/nginx-slim/build.sh
@@ -17,9 +17,9 @@
 
 set -e
 
-export NGINX_VERSION=1.13.1
+export NGINX_VERSION=1.13.2
 export NDK_VERSION=0.3.0
-export VTS_VERSION=0.1.14
+export VTS_VERSION=0.1.15
 export SETMISC_VERSION=0.31
 export LUA_VERSION=0.10.8
 export STICKY_SESSIONS_VERSION=08a395c66e42
@@ -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 a5856c72a6609a4dc68c88a7f3c33b79e6693343b62952e021e043fe347b6776 \
+get_src d77f234d14989d273a363f570e1d892395c006fef2ec04789be90f41a1919b70 \
         "http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz"
 
 get_src 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 \
@@ -86,7 +86,7 @@ get_src 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 \
 get_src 97946a68937b50ab8637e1a90a13198fe376d801dc3e7447052e43c28e9ee7de \
         "https://github.com/openresty/set-misc-nginx-module/archive/v$SETMISC_VERSION.tar.gz"
 
-get_src e3b0018959ac899b73d3843e07351023f02be0ff421214426e3fe32193138963 \
+get_src 5112a054b1b1edb4c0042a9a840ef45f22abb3c05c68174e28ebf483164fb7e1 \
         "https://github.com/vozlt/nginx-module-vts/archive/v$VTS_VERSION.tar.gz"
 
 get_src d67449c71051b3cc2d6dd60df0ae0d21fca08aa19c9b30c5b95ee21ff38ef8dd \

diff --git a/images/nginx-slim/rc.yaml b/images/nginx-slim/rc.yaml
@@ -29,6 +29,6 @@ spec:
     spec:
       containers:
       - name: nginxslim
-        image: gcr.io/google_containers/nginx-slim:0.19
+        image: gcr.io/google_containers/nginx-slim:0.20
         ports:
         - containerPort: 80