Merge pull request #135 from nginxinc/update

pleshakov · web-flow · commit db463693ffd6 · 2017-04-14T15:29:01.000+01:00
Update NGINX version to 1.11.13, golang to 1.8
diff --git a/nginx-controller/Dockerfile b/nginx-controller/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.11.8
+FROM nginx:1.11.13
 
 # forward nginx access and error logs to stdout and stderr of the ingress
 # controller process
diff --git a/nginx-controller/DockerfileForAlpine b/nginx-controller/DockerfileForAlpine
@@ -1,4 +1,4 @@
-FROM nginx:1.11.8-alpine
+FROM nginx:1.11.13-alpine
 
 # forward nginx access and error logs to stdout and stderr of the ingress
 # controller process
diff --git a/nginx-controller/Makefile b/nginx-controller/Makefile
@@ -5,7 +5,7 @@ TAG = $(VERSION)
 PREFIX = nginxdemos/nginx-ingress
 
 DOCKER_RUN = docker run --rm -v $(shell pwd)/../:/go/src/github.com/nginxinc/kubernetes-ingress -w /go/src/github.com/nginxinc/kubernetes-ingress/nginx-controller/
-GOLANG_CONTAINER = golang:1.7
+GOLANG_CONTAINER = golang:1.8
 DOCKERFILE = Dockerfile
 
 BUILD_IN_CONTAINER = 1
diff --git a/nginx-plus-controller/Makefile b/nginx-plus-controller/Makefile
@@ -5,7 +5,7 @@ TAG = $(VERSION)
 PREFIX =
 
 DOCKER_RUN = docker run --rm -v $(shell pwd)/../:/go/src/github.com/nginxinc/kubernetes-ingress -w /go/src/github.com/nginxinc/kubernetes-ingress/nginx-plus-controller/
-GOLANG_CONTAINER = golang:1.7
+GOLANG_CONTAINER = golang:1.8
 
 BUILD_IN_CONTAINER = 1
 PUSH_TO_GCR =

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM nginx:1.11.8`
	`1`	`+FROM nginx:1.11.13`
`2`	`2`
`3`	`3`	`# forward nginx access and error logs to stdout and stderr of the ingress`
`4`	`4`	`# controller process`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM nginx:1.11.8-alpine`
	`1`	`+FROM nginx:1.11.13-alpine`
`2`	`2`
`3`	`3`	`# forward nginx access and error logs to stdout and stderr of the ingress`
`4`	`4`	`# controller process`