Merge pull request #100 from bryanlatten/parent-update

bryanlatten · web-flow · commit 6d5d84fdc81e · 2016-09-30T11:36:44.000-04:00
Dockerfile: update parent
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM behance/docker-nginx:6.0
+FROM behance/docker-nginx:6.1
 MAINTAINER Bryan Latten <latten@adobe.com>
 
 # Set TERM to suppress warning messages.
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
@@ -1,4 +1,4 @@
-FROM behance/docker-nginx:6.0-alpine
+FROM behance/docker-nginx:6.1-alpine
 MAINTAINER Bryan Latten <latten@adobe.com>
 
 # Set TERM to suppress warning messages.
diff --git a/Dockerfile-edge b/Dockerfile-edge
@@ -1,4 +1,4 @@
-FROM behance/docker-nginx:6.0
+FROM behance/docker-nginx:6.1
 MAINTAINER Bryan Latten <latten@adobe.com>
 
 # Set TERM to suppress warning messages.

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM behance/docker-nginx:6.0`
	`1`	`+FROM behance/docker-nginx:6.1`
`2`	`2`	`MAINTAINER Bryan Latten <latten@adobe.com>`
`3`	`3`
`4`	`4`	`# Set TERM to suppress warning messages.`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM behance/docker-nginx:6.0-alpine`
	`1`	`+FROM behance/docker-nginx:6.1-alpine`
`2`	`2`	`MAINTAINER Bryan Latten <latten@adobe.com>`
`3`	`3`
`4`	`4`	`# Set TERM to suppress warning messages.`