Merge pull request #1737 from aledbf/update-nginx

Update nginx v1.13.7
kubernetes · Nov 22, 2017 · 51da945 · 51da945
2 parents 419fe52 + e52275d
commit 51da945
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/images/nginx/Makefile b/images/nginx/Makefile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # 0.0.0 shouldn't clobber any released builds
-TAG ?= 0.29
+TAG ?= 0.30
 REGISTRY ?= quay.io/kubernetes-ingress-controller
 ARCH ?= $(shell go env GOARCH)
 DOCKER ?= gcloud docker --

diff --git a/images/nginx/README.md b/images/nginx/README.md
@@ -26,7 +26,7 @@ This image does provides a default configuration file with no backend servers.
 *Using docker*
 
 ```console
-docker run -v /some/nginx.con:/etc/nginx/nginx.conf:ro quay.io/kubernetes-ingress-controller/nginx:0.29
+docker run -v /some/nginx.con:/etc/nginx/nginx.conf:ro quay.io/kubernetes-ingress-controller/nginx:0.30
 ```
 
 *Creating a replication controller*

diff --git a/images/nginx/build.sh b/images/nginx/build.sh
@@ -19,7 +19,7 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-export NGINX_VERSION=1.13.6
+export NGINX_VERSION=1.13.7
 export NDK_VERSION=0.3.0
 export VTS_VERSION=0.1.15
 export SETMISC_VERSION=0.31
@@ -90,7 +90,7 @@ mkdir --verbose -p "$BUILD_PATH"
 cd "$BUILD_PATH"
 
 # download, verify and extract the source files
-get_src 8512fc6f986a20af293b61f33b0e72f64a72ea5b1acbcc790c4c4e2d6f63f8f8 \
+get_src beb732bc7da80948c43fd0bf94940a21a21b1c1ddfba0bd99a4b88e026220f5c \
         "http://nginx.org/download/nginx-$NGINX_VERSION.tar.gz"
 
 get_src 88e05a99a8a7419066f5ae75966fb1efc409bad4522d14986da074554ae61619 \

diff --git a/images/nginx/rc.yaml b/images/nginx/rc.yaml
@@ -32,6 +32,6 @@ spec:
     spec:
       containers:
       - name: nginx
-        image: quay.io/kubernetes-ingress-controller/nginx:0.29
+        image: quay.io/kubernetes-ingress-controller/nginx:0.30
         ports:
         - containerPort: 80