Supervisor: basic integration

Author: Bryan Latten

Dockerfile

@@ -1,4 +1,4 @@
-FROM behance/docker-nginx:1.1.1
+FROM behance/docker-nginx:1.2.0
 MAINTAINER Bryan Latten <latten@adobe.com>
 
 # Install pre-reqs for the next steps
@@ -32,7 +32,6 @@ RUN apt-get update && \
         php5-json \
         php5-xdebug \
         newrelic-php5 \
-        nano \
         wget \
         git \
         && \

container/root/run.d/99-phpfpm.sh

@@ -2,6 +2,12 @@
 
 PHPFPM_CONF=/etc/php5/fpm/pool.d/www.conf
 
+if [[ $CONTAINER_ROLE != 'web' ]]
+then
+  echo '[php-fpm] non-web mode, bypassing run sequence'
+  exit
+fi
+
 echo '[php-fpm] setting sensible PHP defaults'
 php5enmod defaults