Merge pull request #330 from nginxinc/update-nginx-oss-to-1-15-2

pleshakov · web-flow · commit d30fedf70969 · 2018-08-07T11:27:03.000+01:00
Update NGINX version to 1.15.2
diff --git a/nginx-controller/Dockerfile b/nginx-controller/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.13.12
+FROM nginx:1.15.2
 
 # 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.13.12-alpine
+FROM nginx:1.15.2-alpine
 
 # forward nginx access and error logs to stdout and stderr of the ingress
 # controller process

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM nginx:1.13.12`
	`1`	`+FROM nginx:1.15.2`
`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.13.12-alpine`
	`1`	`+FROM nginx:1.15.2-alpine`
`2`	`2`
`3`	`3`	`# forward nginx access and error logs to stdout and stderr of the ingress`
`4`	`4`	`# controller process`