Merge pull request #53 from bryanlatten/feature-base21-update

bryanlatten · web-flow · commit 576f23e1f64e · 2017-10-02T10:49:05.000-07:00
Dockerfile: updating to latest parent
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM behance/docker-base:2.0
+FROM behance/docker-base:2.1
 MAINTAINER Bryan Latten <latten@adobe.com>
 
 ENV CONTAINER_ROLE=web \
diff --git a/Dockerfile-alpine b/Dockerfile-alpine
@@ -1,4 +1,4 @@
-FROM behance/docker-base:2.0-alpine
+FROM behance/docker-base:2.1-alpine
 MAINTAINER Bryan Latten <latten@adobe.com>
 
 # Use in multi-phase builds, when an init process requests for the container to gracefully exit, so that it may be committed

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM behance/docker-base:2.0`
	`1`	`+FROM behance/docker-base:2.1`
`2`	`2`	`MAINTAINER Bryan Latten <[email protected]>`
`3`	`3`
`4`	`4`	`ENV CONTAINER_ROLE=web \`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM behance/docker-base:2.0-alpine`
	`1`	`+FROM behance/docker-base:2.1-alpine`
`2`	`2`	`MAINTAINER Bryan Latten <[email protected]>`
`3`	`3`
`4`	`4`	`# Use in multi-phase builds, when an init process requests for the container to gracefully exit, so that it may be committed`