Merge pull request #43 from bryanlatten/nginx-upgrade

Dockerfile: added nginx PPA

Dockerfile

@@ -21,10 +21,16 @@ RUN add-apt-repository ppa:git-core/ppa -y && \
     apt-get update -yq && \
     apt-get install -yq git
 
-# singularity_runner
+# 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 && \
+    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
 
@@ -44,7 +50,6 @@ RUN apt-get update && \
         php5-mcrypt \
         php5-json \
         php5-xdebug \
-        nginx \
         nano && \
     php5dismod xdebug
 
@@ -56,6 +61,7 @@ RUN printf "\n" | pecl install apcu-4.0.7 && \
     echo 'extension=apcu.so' > /etc/php5/mods-available/apcu.ini && \
     php5enmod apcu
 
+
 # Perform cleanup, ensure unnecessary packages are removed
 RUN apt-get autoclean -y && \
     apt-get autoremove -y && \

README.md

@@ -4,14 +4,15 @@ docker-php
 Provides basic building blocks for PHP web applications
 
 ###Includes
---- 
+---
 - Nginx
-- PHP-FPM (5.6)
+- PHP/PHP-FPM (5.6)
 - Extra PHP Modules:
   - apcu
   - curl
   - gearman
   - igbinary
+  - intl
   - mcrypt
   - memcache
   - memcached (yes, both...)
@@ -22,3 +23,6 @@ Provides basic building blocks for PHP web applications
 ###Expectations
 ---
 Applications that leverage `bryanlatten/docker-php` in their Dockerfile are expected have a root directory in their source code named `public` -- this will be automatically assigned as the webroot for the web server.
+
+Development libraries are made available (php5-dev) for downstream app to use to add dependencies, such as PECL modules. Please run /clean.sh at the end of a child build to ensure these packages are removed before production.
+

container/root/clean.sh

@@ -1,9 +1,8 @@
 #!/bin/bash
 
 # Perform cleanup, ensure unnecessary packages are removed
-apt-get remove -yq \
+apt-get remove --purge -yq \
     wget \
-    git \
     php5-dev \
     gcc && \
 apt-get autoclean -y && \