Merge pull request #51 from bryanlatten/new-parent

Dockerfile: using behance-nginx as parent

Author: Bryan Latten

Dockerfile

@@ -1,44 +1,21 @@
-FROM ubuntu:14.04.2
+FROM behance/docker-nginx:1.0.0
 MAINTAINER Bryan Latten <latten@adobe.com>
 
-# Define the location where downstream app should live, with a child public folder
-ENV HTTP_WEBROOT /app/public
-
-# Install pre-reqs, security updates
-RUN apt-get update && \
-    apt-get -yq install \
-        openssl=1.0.1f-1ubuntu2.15 \
-        ca-certificates=20141019ubuntu0.14.04.1 \
-        wget
-
-# Ensure package list is up to date, add tool for PPA in the next step
-RUN apt-get update && \
-    apt-get install software-properties-common=0.92.37.3 -y
-
-# Install latest git with security updates
-# http://article.gmane.org/gmane.linux.kernel/1853266
-RUN add-apt-repository ppa:git-core/ppa -y && \
-    apt-get update -yq && \
-    apt-get install -yq git
-
 # Install singularity_runner
 RUN apt-get install build-essential ruby1.9.1-dev -y && \
     gem install --no-rdoc --no-ri singularity_dsl --version 1.6.3
 
-
-# Install latest nginx-stable
-RUN add-apt-repository ppa:nginx/stable -y && \
+RUN locale-gen en_US.UTF-8 && export LANG=en_US.UTF-8 && \
+    add-apt-repository ppa:git-core/ppa -y && \
+    add-apt-repository ppa:ondrej/php5-5.6 -y && \
     apt-get update -yq && \
-    apt-get install -yq nginx=1.8.0-1+trusty1
-
-# IMPORTANT: PPA has UTF-8 characters in it that will fail unless locale is generated
-RUN locale-gen en_US.UTF-8 && export LANG=en_US.UTF-8 && add-apt-repository ppa:ondrej/php5-5.6 -y
+    apt-get install -yq git
 
 # Update package cache with new PPA, install language and modules
 RUN apt-get update && \
     apt-get -yq install \
-        php5=5.6.11+dfsg-1+deb.sury.org~trusty+1 \
-        php5-fpm=5.6.11+dfsg-1+deb.sury.org~trusty+1 \
+        php5=5.6.12+dfsg-1+deb.sury.org~trusty+1 \
+        php5-fpm=5.6.12+dfsg-1+deb.sury.org~trusty+1 \
         php5-gearman=1.1.2-1+deb.sury.org~trusty+2 \
         php5-memcache=3.0.8-5+deb.sury.org~trusty+1 \
         php5-memcached=2.2.0-2+deb.sury.org~trusty+1 \

container/root/run.d/01-composer.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+
+# As part of the "Two Phase" build, the first phase typically runs with composer keys mounted,
+# allowing the dependencies to be installed, the result of which is committed
+
+if [[ -f /root/.composer/config.json ]]
+then
+  echo "[composer] installing app dependencies"
+  composer install
+  exit 99  # Signals for container to stop
+fi

container/root/run.d/02-env.sh

@@ -0,0 +1,12 @@
+#!/bin/bash
+
+# Adds docker environment variables where entering them as PHP-FPM environment variables
+VARS=`env | grep ^CFG_`;
+DEST_CONF=/etc/php5/fpm/pool.d/www.conf
+
+echo '[env] importing environment variables (prefixed by CFG_)'
+for p in $VARS
+do
+  ENV='env['${p/=/] = \"}\"
+  echo $ENV >> $DEST_CONF
+done

container/root/run.d/03-debug.sh

@@ -0,0 +1,20 @@
+#!/bin/bash
+
+if [[ $CFG_APP_DEBUG = 1 || $CFG_APP_DEBUG = '1' || $CFG_APP_DEBUG = 'true' ]]
+then
+
+  FASTCGI_PARAM_FILE=/etc/nginx/fastcgi_params
+  echo '[debug] increasing fastcgi buffer size for debug headers'
+  echo "" >> $FASTCGI_PARAM_FILE
+  echo "# Debug Buffer Sizes" >> $FASTCGI_PARAM_FILE
+  echo "fastcgi_buffer_size 16k;" >> $FASTCGI_PARAM_FILE
+  echo "fastcgi_buffers 4 16k;" >> $FASTCGI_PARAM_FILE
+
+  echo '[debug] opcache disabled'
+  php5dismod opcache
+
+else
+  echo '[debug] Opcache set to PERFORMANCE, NOT watching for file changes'
+  echo 'opcache.revalidate_freq=0' >> /etc/php5/mods-available/opcache.ini
+  echo 'opcache.validate_timestamps=0' >> /etc/php5/mods-available/opcache.ini
+fi

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

@@ -0,0 +1,26 @@
+#!/bin/bash
+
+PHPFPM_CONF=/etc/php5/fpm/pool.d/www.conf
+
+echo '[php-fpm] setting sensible PHP defaults'
+php5enmod defaults
+
+# Baseline "optimizations" before ApacheBench succeeded at concurrency of 150
+# TODO: base on current memory capacity + CPU cores
+sed -i "s/pm.max_children = [0-9]\+/pm.max_children = 48/" $PHPFPM_CONF
+sed -i "s/pm.start_servers = [0-9]\+/pm.start_servers = 16/" $PHPFPM_CONF
+sed -i "s/pm.min_spare_servers = [0-9]\+/pm.min_spare_servers = 4/" $PHPFPM_CONF
+sed -i "s/pm.max_spare_servers = [0-9]\+/pm.max_spare_servers = 32/" $PHPFPM_CONF
+
+# php5-fpm processes must pick up stdout/stderr from workers, will cause minor performance decrease (but is required)
+sed -i "s/;catch_workers_output/catch_workers_output/" $PHPFPM_CONF
+
+
+# 1. runs php5-fpm as foreground (-F)
+# 2. forcing php5-fpm to log to stderr even if a non-terminal is attached (-O)
+# 3. redirect stderr to stdout
+# 4. filtering the garbage string that PHP-FPM for no-reason-at-all decided to wrap the message in,
+# 5. reconnecting the stdout to current stdout
+# 6. backgrounding that process
+echo '[php-fpm] starting (background)'
+php5-fpm -F -O 2>&1 | sed -u 's,.*: \"\(.*\)$,\1,'| sed -u 's,"$,,' 1>&1 &