Merge pull request #52 from bryanlatten/parent-update

Bryan Latten · Bryan Latten · commit 33be33b602bc · 2015-08-19T12:44:18.000-04:00
Dockerfile: updated to latest parent
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM behance/docker-nginx:1.0.0
+FROM behance/docker-nginx:1.1.1
 MAINTAINER Bryan Latten <latten@adobe.com>
 
 # Install singularity_runner
diff --git a/container/root/run.d/01-install.sh b/container/root/run.d/01-install.sh
@@ -5,7 +5,7 @@
 
 if [[ -f /root/.composer/config.json ]]
 then
-  echo "[composer] installing app dependencies"
+  echo "[install] app dependencies"
   composer install
-  exit 99  # Signals for container to stop
+  exit $SIGNAL_BUILD_STOP
 fi

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM behance/docker-nginx:1.0.0`
	`1`	`+FROM behance/docker-nginx:1.1.1`
`2`	`2`	`MAINTAINER Bryan Latten <latten@adobe.com>`
`3`	`3`
`4`	`4`	`# Install singularity_runner`