Merge pull request KyleAMathews#16 from sp90/master

KyleAMathews · web-flow · commit f926be9af6df · 2016-12-21T09:34:43.000-07:00
Update nginx version
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.9
+FROM nginx:1.10.2
 MAINTAINER Kyle Mathews "mathews.kyle@gmail.com"
 
 RUN rm /etc/nginx/nginx.conf /etc/nginx/mime.types

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM nginx:1.9`
	`1`	`+FROM nginx:1.10.2`
`2`	`2`	`MAINTAINER Kyle Mathews "[email protected]"`
`3`	`3`
`4`	`4`	`RUN rm /etc/nginx/nginx.conf /etc/nginx/mime.types`