Merge pull request #66 from bryanlatten/base-2.6

bryanlatten · web-flow · commit 188e4c73305d · 2019-04-12T15:06:15.000-04:00
Dockerfile: upgraded to base v2.6
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM behance/docker-base:2.5-ubuntu-18.04
+FROM behance/docker-base:2.6-ubuntu-18.04
 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.5-alpine
+FROM behance/docker-base:2.6-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
diff --git a/Dockerfile-centos b/Dockerfile-centos
@@ -1,4 +1,4 @@
-FROM behance/docker-base:2.5-centos
+FROM behance/docker-base:2.6-centos
 MAINTAINER Bryan Latten <latten@adobe.com>
 
 ENV CONTAINER_ROLE=web \

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM behance/docker-base:2.5-ubuntu-18.04`
	`1`	`+FROM behance/docker-base:2.6-ubuntu-18.04`
`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.5-alpine`
	`1`	`+FROM behance/docker-base:2.6-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`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM behance/docker-base:2.5-centos`
	`1`	`+FROM behance/docker-base:2.6-centos`
`2`	`2`	`MAINTAINER Bryan Latten <[email protected]>`
`3`	`3`
`4`	`4`	`ENV CONTAINER_ROLE=web \`