Refactored to monorepo setup, new images, etc

.gitignore

@@ -1 +1,2 @@
 docker-compose.override.yml
+html/

README.md

@@ -1,12 +1,12 @@
-This docker-compose.yml file is provided by Mage Inferno
+Mark Shust's Magento 2 Docker Compose
 
 ## Docker Hub
 
-View our Docker Hub images at [https://hub.docker.com/u/mageinferno/](https://hub.docker.com/u/mageinferno/)
+View Docker Hub images at [https://hub.docker.com/u/markoshust/](https://hub.docker.com/u/markoshust/)
 
 ## Usage
 
-This file is provided as an example development environment using Mage Inferno Magento 2 Docker Images.
+This file is provided as an example environment using Mark Shust's Magento 2 Docker Images.
 
 ## Composer Setup
 
@@ -35,7 +35,7 @@ You can install Magento Enterprise via Composer by setting `M2SETUP_USE_COMPOSER
 
 ## Composer-less, No-Auth Setup
 
-If you don't want to use Composer or setup the auth keys above, no worries. Mage Inferno install script uses Nexcess' hosted Magento archives for a Composer-less install process. Just set the `M2SETUP_USE_ARCHIVE` environment variable to `true` when running setup.
+If you don't want to use Composer or setup the auth keys above, no worries. The install script uses Nexcess' hosted Magento archives for a Composer-less install process. Just set the `M2SETUP_USE_ARCHIVE` environment variable to `true` when running setup.
 
 ## Running Setup
 
@@ -49,7 +49,7 @@ You may modify any environment variables depending on your requirements.
 
 ## Data Volumes
 
-Your Magento source data is persistently stored within Docker data volumes. For local development, we advise copying the entire contents of the `appdata` data volume to your local machine (after setup is complete of course). Since you shouldn't be modifying any of these files, this is just to bring the fully copy of the site back to your host:
+Your Magento source data is persistently stored within Docker data volumes. For local development, I advise copying the entire contents of the `appdata` data volume to your local machine (after setup is complete of course). Since you shouldn't be modifying any of these files, this is just to bring the fully copy of the site back to your host:
 
 ```
 docker cp CONTAINERID:/var/www/html ./
@@ -65,7 +65,7 @@ Any edits to these directories will correctly sync with your Docker volume.
 
 ## Running Magento CLI tool
 
-We've setup scripts to aid in the running of Magento CLI tool with the correct permissions. To run the command line tool, you would connect as any other Docker Compose application would:
+I've setup scripts to aid in the running of Magento CLI tool with the correct permissions. To run the command line tool, you would connect as any other Docker Compose application would:
 
 ```
 docker-compose exec phpfpm ./bin/magento
@@ -108,8 +108,4 @@ SQLSTATE[HY000] [2002] Connection refused
   Parameter validation failed
 ```
 
-If you receive this error, it's because the database driver has not initialized before the setup script commences execution. The easy fix for this is to run the setup command again immediately after this error:
-
-### PHP 7.1 Unusable
-
-[PHP 7.1 will not be supported until Magento 2.2](https://github.com/magento/magento2/issues/5880)
+If you receive this error, it's because the database driver has not initialized before the setup script commences execution. The easy fix for this is to run the setup command again immediately after this error.

docker-compose.override.yml.dist

@@ -1,4 +1,4 @@
-# Mage Inferno Docker Compose Override Example (https://github.com/mageinferno/magento2-docker-compose)
+# Mark Shust's Magento 2 Docker Compose Override Example (https://github.com/markoshust/magento2-docker)
 #
 # You can use this file to change any of the defaults supplied in docker-compose.yml
 # Copy this file to docker-compose.override.yml. Docker compose will read these changes for you.
@@ -12,12 +12,13 @@
 #    volumes: &appvolumes
 #      - appdata:/var/www/html
 #      - ~/.composer:/var/www/.composer
-#      - ./html/app/code:/var/www/html/app/code
-#      - ./html/app/design:/var/www/html/app/design 
+#      - ./html/app:/var/www/html/app
 #
 #  phpfpm:
 #    volumes: *appvolumes
 #
 #  setup:
+#    volumes: *appvolumes
 #    environment:
 #      - M2SETUP_USE_ARCHIVE=false
+#      - M2SETUP_USE_SAMPLE_DATA=false

docker-compose.yml

@@ -1,11 +1,11 @@
-# Mage Inferno Docker Compose (https://github.com/mageinferno/magento2-docker-compose)
-# Version 7.0.0
+# Mark Shust's Magento 2 Docker Compose (https://github.com/markoshust/magento2-docker)
+# Version 10.0.0
 
 version: "3"
 
 services:
   app:
-    image: mageinferno/magento2-nginx:1.11-1
+    image: markoshust/magento2-nginx:1.13-0
     links:
       - db
       - phpfpm
@@ -17,7 +17,7 @@ services:
       - www
 
   phpfpm:
-    image: mageinferno/magento2-php:7.0-fpm-1
+    image: markoshust/magento2-php:7.1-fpm-0
     links:
       - db
     volumes: *appvolumes
@@ -33,7 +33,7 @@ services:
     env_file: env/mysql.env
 
   setup:
-    image: mageinferno/magento2-php:7.0-fpm-1
+    image: markoshust/magento2-php:7.1-fpm-0
     command: /usr/local/bin/mage-setup
     links:
       - db

env/setup.env

@@ -11,7 +11,7 @@ M2SETUP_ADMIN_PASSWORD=magento2
 M2SETUP_CURRENCY=USD
 M2SETUP_LANGUAGE=en_US
 M2SETUP_TIMEZONE=America/New_York
-M2SETUP_USE_SAMPLE_DATA=false
+M2SETUP_USE_SAMPLE_DATA=true
 M2SETUP_USE_ARCHIVE=true
 M2SETUP_USE_COMPOSER_ENTERPRISE=false
-M2SETUP_VERSION=2.1.6
+M2SETUP_VERSION=2.2.0

nginx/Dockerfile

@@ -0,0 +1,14 @@
+FROM nginx:1.13
+MAINTAINER Mark Shust <mark@shust.com>
+
+ENV PHP_HOST phpfpm
+ENV PHP_PORT 9000
+ENV APP_MAGE_MODE default
+
+COPY ./conf/nginx.conf /etc/nginx/
+COPY ./conf/default.conf /etc/nginx/conf.d/
+COPY ./bin/start.sh /usr/local/bin/start.sh
+
+WORKDIR /var/www/html
+
+CMD ["/usr/local/bin/start.sh"]

nginx/LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Mage Inferno
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

nginx/README.md

@@ -0,0 +1,25 @@
+# Versions
+
+- [`1.11-1` (_Dockerfile_)](https://github.com/mageinferno/docker-magento2-nginx/tree/1.11-1/Dockerfile)
+
+# Description
+
+This image is built from [`nginx`](https://hub.docker.com/_/nginx/) and contains the default webserver configuration for Magento 2.
+
+# What's in this image?
+
+This image installs the following:
+
+- `nginx`
+
+# Variables
+
+The following environment variables are used for Nginx configuration:
+
+- `PHP_HOST`: (default: `phpfpm`) The hostname of the PHP container.
+- `PHP_PORT`: (default: `9000`) The port of the PHP container.
+- `APP_MAGE_MODE`: (default: `default`) Set the appropriate MAGE_MODE.
+
+# Docker Compose
+
+Please see [https://github.com/mageinferno/magento2-docker-compose](https://github.com/mageinferno/magento2-docker-compose) for more detailed instructions and an example development environment using Docker Compose.

nginx/bin/start.sh

@@ -0,0 +1,6 @@
+#!/bin/bash
+[ ! -z "${PHP_HOST}" ]                 && sed -i "s/PHP_HOST/${PHP_HOST}/" /etc/nginx/conf.d/default.conf
+[ ! -z "${PHP_PORT}" ]                 && sed -i "s/PHP_PORT/${PHP_PORT}/" /etc/nginx/conf.d/default.conf
+[ ! -z "${APP_MAGE_MODE}" ]            && sed -i "s/APP_MAGE_MODE/${APP_MAGE_MODE}/" /etc/nginx/conf.d/default.conf
+
+/usr/sbin/nginx -g "daemon off;"

nginx/conf/default.conf

@@ -0,0 +1,177 @@
+upstream fastcgi_backend {
+  server PHP_HOST:PHP_PORT;
+}
+
+server {
+  listen 80;
+  server_name localhost;
+
+  set $MAGE_ROOT /var/www/html;
+  set $MAGE_MODE APP_MAGE_MODE;
+
+  root $MAGE_ROOT/pub;
+
+  index index.php;
+  autoindex off;
+  charset off;
+
+  add_header 'X-Content-Type-Options' 'nosniff';
+
+  location /setup {
+    root $MAGE_ROOT;
+
+    location ~ ^/setup/index.php {
+      fastcgi_pass   fastcgi_backend;
+      fastcgi_index  index.php;
+      fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+      include    fastcgi_params;
+    }
+
+    location ~ ^/setup/(?!pub/). {
+      deny all;
+    }
+
+    location ~ ^/setup/pub/ {
+      add_header X-Frame-Options "SAMEORIGIN";
+    }
+  }
+  
+  location /update {
+    root $MAGE_ROOT;
+
+    location ~ ^/update/index.php {
+      fastcgi_split_path_info ^(/update/index.php)(/.+)$;
+      fastcgi_pass   fastcgi_backend;
+      fastcgi_index  index.php;
+      fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+      fastcgi_param  PATH_INFO    $fastcgi_path_info;
+      include    fastcgi_params;
+    }
+
+    # deny everything but index.php
+    location ~ ^/update/(?!pub/). {
+      deny all;
+    }
+
+    location ~ ^/update/pub/ {
+      add_header X-Frame-Options "SAMEORIGIN";
+    }
+  }
+
+  location / {
+    try_files $uri $uri/ /index.php?$args;
+  }
+  
+  location /pub {
+    location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) {
+      deny all;
+    }
+
+    alias $MAGE_ROOT/pub;
+    add_header X-Frame-Options "SAMEORIGIN";
+  }
+  
+  location /static/ {
+    if ($MAGE_MODE = "production") {
+      expires max;
+    }
+
+    # remove signature of static files used to overcome browser cache
+    location ~ ^/static/version {
+      rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last;
+    }
+
+    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
+      add_header Cache-Control "public";
+      add_header X-Frame-Options "SAMEORIGIN";
+      expires +1y;
+  
+      if (!-f $request_filename) {
+        rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
+      }
+    }
+
+    location ~* \.(zip|gz|gzip|bz2|csv|xml)$ {
+      add_header Cache-Control "no-store";
+      add_header X-Frame-Options "SAMEORIGIN";
+      expires off;
+      
+      if (!-f $request_filename) {
+         rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
+      }
+    }
+
+    if (!-f $request_filename) {
+      rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
+    }
+
+    add_header X-Frame-Options "SAMEORIGIN";
+  }
+  
+  location /media/ {
+    try_files $uri $uri/ /get.php?$args;
+
+    location ~ ^/media/theme_customization/.*\.xml {
+      deny all;
+    }
+
+    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
+      add_header Cache-Control "public";
+      add_header X-Frame-Options "SAMEORIGIN";
+      expires +1y;
+      try_files $uri $uri/ /get.php?$args;
+    }
+
+    location ~* \.(zip|gz|gzip|bz2|csv|xml)$ {
+      add_header Cache-Control "no-store";
+      add_header X-Frame-Options "SAMEORIGIN";
+      expires off;
+      try_files $uri $uri/ /get.php?$args;
+    }
+
+    add_header X-Frame-Options "SAMEORIGIN";
+  }
+  
+  location /media/customer/ {
+    deny all;
+  }
+  
+  location /media/downloadable/ {
+    deny all;
+  }
+  
+  location /media/import/ {                                                    
+    deny all;                                                              
+  }
+
+  location ~ /media/theme_customization/.*\.xml$ {
+    deny all;
+  }
+  
+  location /errors/ {
+    try_files $uri =404;
+  }
+  
+  location ~ ^/errors/.*\.(xml|phtml)$ {
+    deny all;
+  }
+  
+  location ~ cron\.php {
+    deny all;
+  }
+
+  location ~ (index|get|static|report|404|503)\.php$ {
+    try_files $uri =404;
+    fastcgi_pass   fastcgi_backend;
+  
+    fastcgi_param  PHP_FLAG  "session.auto_start=off \n suhosin.session.cryptua=off";
+    fastcgi_param  PHP_VALUE "max_execution_time=600";
+    fastcgi_read_timeout 600s;
+    fastcgi_connect_timeout 600s;
+    fastcgi_param  MAGE_MODE $MAGE_MODE;
+  
+    fastcgi_index  index.php;
+    fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
+    include    fastcgi_params;
+  }
+}

nginx/conf/nginx.conf

@@ -0,0 +1,32 @@
+
+user  www-data;
+worker_processes  1;
+
+error_log  /var/log/nginx/error.log debug;
+pid        /var/run/nginx.pid;
+
+
+events {
+    worker_connections  1024;
+}
+
+
+http {
+    include       /etc/nginx/mime.types;
+    default_type  application/octet-stream;
+
+    log_format  main  '$remote_addr - $remote_user [$time_local] "$request" '
+                      '$status $body_bytes_sent "$http_referer" '
+                      '"$http_user_agent" "$http_x_forwarded_for"';
+
+    access_log  /var/log/nginx/access.log  main;
+
+    sendfile        on;
+    #tcp_nopush     on;
+
+    keepalive_timeout  65;
+
+    #gzip  on;
+
+    include /etc/nginx/conf.d/*.conf;
+}

php/Dockerfile

@@ -0,0 +1,50 @@
+FROM php:7.1-fpm
+MAINTAINER Mark Shust <mark@shust.com>
+
+RUN apt-get update && apt-get install -y \
+  cron \
+  libfreetype6-dev \
+  libicu-dev \
+  libjpeg62-turbo-dev \
+  libmcrypt-dev \
+  libpng12-dev \
+  libxslt1-dev \
+  mysql-client \
+  zip \
+  git
+
+RUN docker-php-ext-configure \
+  gd --with-freetype-dir=/usr/include/ --with-jpeg-dir=/usr/include/
+
+RUN docker-php-ext-install \
+  bcmath \
+  gd \
+  intl \
+  mbstring \
+  mcrypt \
+  opcache \
+  pdo_mysql \
+  soap \
+  xsl \
+  zip
+
+RUN curl -sS https://getcomposer.org/installer | \
+  php -- --install-dir=/usr/local/bin --filename=composer
+
+ENV PHP_MEMORY_LIMIT 2G
+ENV PHP_PORT 9000
+ENV PHP_PM dynamic
+ENV PHP_PM_MAX_CHILDREN 10
+ENV PHP_PM_START_SERVERS 4
+ENV PHP_PM_MIN_SPARE_SERVERS 2
+ENV PHP_PM_MAX_SPARE_SERVERS 6
+ENV APP_MAGE_MODE default
+
+COPY conf/www.conf /usr/local/etc/php-fpm.d/
+COPY conf/php.ini /usr/local/etc/php/
+COPY conf/php-fpm.conf /usr/local/etc/
+COPY bin/* /usr/local/bin/
+
+WORKDIR /var/www/html
+
+CMD ["/usr/local/bin/start"]

php/LICENSE.md

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2016 Mage Inferno
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

php/README.md

@@ -0,0 +1,49 @@
+# Versions
+
+- [`7.1-fpm-0` (_Dockerfile_)](https://github.com/markoshust/docker-magento2/tree/7.1-fpm-0/Dockerfile)
+
+# Description
+
+This image is built from the official [`php`](https://hub.docker.com/_/php/) repository and contains PHP configurations for Magento 2.
+
+# What's in this image?
+
+This image installs the following base packages:
+
+- `composer`
+- `php-fpm`
+
+This image also installs the following PHP extensions, which are the minimally required extensions to install and run Magento 2:
+
+- `bcmath`
+- `gd`
+- `intl`
+- `mbstring`
+- `mcrypt`
+- `pdo_mysql`
+- `soap`
+- `xsl`
+- `zip`
+
+# Variables
+
+The following variables may be set to control the PHP environment:
+
+- `PHP_MEMORY_LIMIT`: (default `2048M`) Set the memory_limit of php.ini
+- `PHP_PORT`: (default: `9000`) Set a custom PHP port
+- `PHP_PM`: (default `dynamic`) Set the process manager
+- `PHP_PM_MAX_CHILDREN`: (default: `10`) Set the max number of children processes
+- `PHP_PM_START_SERVERS`: (default: `4`) Set the default number of servers to start at runtime
+- `PHP_PM_MIN_SPARE_SERVERS`: (default `2`) Set the minumum number of spare servers
+- `PHP_PM_MAX_SPARE_SERVERS`: (default: `6`) Set the maximum number of spare servers
+- `APP_MAGE_MODE`: (default: `default`) Set the MAGE_MODE
+
+# One-off containers
+
+This image can run one-off PHP commands, such as:
+
+`docker run --rm --name php-test markoshust/magento2-php echo "Hello world"`
+
+Application code is placed in `/var/www/html`. You can also attach a volume to that location, then run Magento-specific commands such as the Magento CLI tool:
+
+`docker run --rm --name mysite -v /Users/username/Sites/mysite/app/code:/var/www/html/app/code markoshust/magento2-php:{PHPVERSION}-fpm-0 ./bin/magento`

php/bin/mage-setup

@@ -0,0 +1,3 @@
+#!/bin/sh
+chown -R www-data:www-data /var/www
+su -c "/usr/local/bin/mage-setup-raw" -s /bin/sh www-data

php/bin/mage-setup-raw

@@ -0,0 +1,67 @@
+#!/bin/sh
+echo "Initializing setup..."
+
+cd /var/www/html
+
+if [ -f ./app/etc/config.php ] || [ -f ./app/etc/env.php ]; then
+  echo "It appears Magento is already installed (app/etc/config.php or app/etc/env.php exist). Exiting setup..."
+  exit
+fi
+
+if [ "$M2SETUP_USE_ARCHIVE" = true ]; then
+  echo "Downloading and untarring archive..."
+  if [ "$M2SETUP_USE_SAMPLE_DATA" = true ]; then
+    curl -L http://pubfiles.nexcess.net/magento/ce-packages/magento2-with-samples-$M2SETUP_VERSION.tar.gz | tar xzf - -o -C .
+  else
+    curl -L http://pubfiles.nexcess.net/magento/ce-packages/magento2-$M2SETUP_VERSION.tar.gz | tar xzf - -o -C .
+  fi
+else
+  if [ "$M2SETUP_USE_COMPOSER_ENTERPRISE" = true ]; then
+      /usr/local/bin/php /usr/local/bin/composer create-project --repository-url=https://repo.magento.com/ magento/project-enterprise-edition=$M2SETUP_VERSION .
+    else
+      /usr/local/bin/php /usr/local/bin/composer create-project --repository-url=https://repo.magento.com/ magento/project-community-edition=$M2SETUP_VERSION .
+  fi
+  ln -s /var/www/.composer ./var/composer_home
+fi
+
+chmod +x ./bin/magento
+
+if [ "$M2SETUP_USE_SAMPLE_DATA" = true ]; then
+  if [ "$M2SETUP_USE_ARCHIVE" != true ]; then
+    echo "Installing composer dependencies..."
+    /usr/local/bin/php /usr/local/bin/composer update
+    /usr/local/bin/php ./bin/magento sampledata:deploy
+  fi
+
+  M2SETUP_USE_SAMPLE_DATA_STRING="--use-sample-data"
+else
+  M2SETUP_USE_SAMPLE_DATA_STRING=""
+fi
+
+echo -n "Waiting for db"
+touch database_not_ready
+while [ -e database_not_ready ]; do
+    mysql --host=$M2SETUP_DB_HOST --user=$M2SETUP_DB_USER --password=$M2SETUP_DB_PASSWORD  --execute="show tables" $M2SETUP_DB_NAME >/dev/null 2>&1 && rm database_not_ready
+    sleep 1s
+    echo -n "."
+done
+echo
+
+echo "Running Magento 2 setup script..."
+/usr/local/bin/php ./bin/magento setup:install \
+  --db-host=$M2SETUP_DB_HOST \
+  --db-name=$M2SETUP_DB_NAME \
+  --db-user=$M2SETUP_DB_USER \
+  --db-password=$M2SETUP_DB_PASSWORD \
+  --base-url=$M2SETUP_BASE_URL \
+  --admin-firstname=$M2SETUP_ADMIN_FIRSTNAME \
+  --admin-lastname=$M2SETUP_ADMIN_LASTNAME \
+  --admin-email=$M2SETUP_ADMIN_EMAIL \
+  --admin-user=$M2SETUP_ADMIN_USER \
+  --admin-password=$M2SETUP_ADMIN_PASSWORD \
+  --language=$M2SETUP_LANGUAGE \
+  --currency=$M2SETUP_CURRENCY \
+  --timezone=$M2SETUP_TIMEZONE \
+  $M2SETUP_USE_SAMPLE_DATA_STRING
+
+echo "The setup script has completed execution."

php/bin/magento

@@ -0,0 +1,10 @@
+#!/usr/bin/env php
+<?php
+$args = array_reduce(array_slice($argv, 1), function ($acc, $arg) {
+    return $acc . ' ' . escapeshellarg($arg);
+}, '');
+
+$cmd = 'su -c "/usr/local/bin/php /var/www/html/bin/magento-php ' . $args . '" -s /bin/sh www-data';
+
+passthru($cmd, $result);
+exit($result);

php/bin/setup-config

@@ -0,0 +1,20 @@
+#!/bin/bash
+BASE_DIR=/var/www
+SRC_DIR=$BASE_DIR/html
+
+if [ -d $SRC_DIR/bin ] && [ ! -f $SRC_DIR/bin/magento-php ]; then
+  mv $SRC_DIR/bin/magento $SRC_DIR/bin/magento-php
+  cp /usr/local/bin/magento $SRC_DIR/bin/
+fi
+
+if [ -d $BASE_DIR/.composer ]; then
+  rm -rf $SRC_DIR/var/composer_home
+  su -c "ln -s $BASE_DIR/.composer $SRC_DIR/var/composer_home" -s /bin/sh www-data
+fi
+
+echo "*/1 * * * * su -c \"/usr/local/bin/php $SRC_DIR/update/cron.php\" -s /bin/sh www-data > /proc/1/fd/2 2>&1" | crontab - \
+  && (crontab -l ; echo "*/1 * * * * su -c \"/usr/local/bin/php $SRC_DIR/bin/magento-php cron:run\" -s /bin/sh www-data > /proc/1/fd/2 2>&1") | crontab - \
+  && (crontab -l ; echo "*/1 * * * * su -c \"/usr/local/bin/php $SRC_DIR/bin/magento-php setup:cron:run\" -s /bin/sh www-data > /proc/1/fd/2 2>&1") | crontab -
+
+# Start the cron service
+/usr/sbin/cron

php/bin/start

@@ -0,0 +1,7 @@
+#!/bin/bash
+
+# Setup config
+/usr/local/bin/setup-config
+
+# Start the php-fpm service
+/usr/local/sbin/php-fpm

php/conf/php-fpm.conf

@@ -0,0 +1,30 @@
+; This file was initially adapated from the output of: (on PHP 5.6)
+;   grep -vE '^;|^ *$' /usr/local/etc/php-fpm.conf.default
+
+[global]
+
+error_log = /proc/self/fd/2
+daemonize = no
+
+[www]
+
+; if we send this to /proc/self/fd/1, it never appears
+access.log = /proc/self/fd/2
+
+user = www-data
+group = www-data
+
+listen = [::]:${PHP_PORT}
+
+pm = ${PHP_PM}
+pm.max_children = ${PHP_PM_MAX_CHILDREN}
+pm.start_servers = ${PHP_PM_START_SERVERS}
+pm.min_spare_servers = ${PHP_PM_MIN_SPARE_SERVERS}
+pm.max_spare_servers = ${PHP_PM_MAX_SPARE_SERVERS}
+
+env[MAGE_MODE] = ${APP_MAGE_MODE}
+
+clear_env = no
+
+; Ensure worker stdout and stderr are sent to the main error log.
+catch_workers_output = yes

php/conf/php.ini

@@ -0,0 +1,2 @@
+memory_limit = ${PHP_MEMORY_LIMIT}
+date.timezone = "UTC"

php/conf/www.conf

@@ -0,0 +1,413 @@
+; Start a new pool named 'www'.
+; the variable $pool can we used in any directive and will be replaced by the
+; pool name ('www' here)
+[www]
+
+; Per pool prefix
+; It only applies on the following directives:
+; - 'access.log'
+; - 'slowlog'
+; - 'listen' (unixsocket)
+; - 'chroot'
+; - 'chdir'
+; - 'php_values'
+; - 'php_admin_values'
+; When not set, the global prefix (or NONE) applies instead.
+; Note: This directive can also be relative to the global prefix.
+; Default Value: none
+;prefix = /path/to/pools/$pool
+
+; Unix user/group of processes
+; Note: The user is mandatory. If the group is not set, the default user's group
+;       will be used.
+user = www-data
+group = www-data
+
+; The address on which to accept FastCGI requests.
+; Valid syntaxes are:
+;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
+;                            a specific port;
+;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses
+;                            (IPv6 and IPv4-mapped) on a specific port;
+;   '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = 127.0.0.1:9000
+
+; Set listen(2) backlog.
+; Default Value: 511 (-1 on FreeBSD and OpenBSD)
+;listen.backlog = 511
+
+; Set permissions for unix socket, if one is used. In Linux, read/write
+; permissions must be set in order to allow connections from a web server. Many
+; BSD-derived systems allow connections regardless of permissions.
+; Default Values: user and group are set as the running user
+;                 mode is set to 0660
+;listen.owner = www-data
+;listen.group = www-data
+;listen.mode = 0660
+; When POSIX Access Control Lists are supported you can set them using
+; these options, value is a comma separated list of user/group names.
+; When set, listen.owner and listen.group are ignored
+;listen.acl_users =
+;listen.acl_groups =
+
+; List of addresses (IPv4/IPv6) of FastCGI clients which are allowed to connect.
+; Equivalent to the FCGI_WEB_SERVER_ADDRS environment variable in the original
+; PHP FCGI (5.2.2+). Makes sense only with a tcp listening socket. Each address
+; must be separated by a comma. If this value is left blank, connections will be
+; accepted from any ip address.
+; Default Value: any
+;listen.allowed_clients = 127.0.0.1
+
+; Specify the nice(2) priority to apply to the pool processes (only if set)
+; The value can vary from -19 (highest priority) to 20 (lower priority)
+; Note: - It will only work if the FPM master process is launched as root
+;       - The pool processes will inherit the master process priority
+;         unless it specified otherwise
+; Default Value: no set
+; process.priority = -19
+
+; Choose how the process manager will control the number of child processes.
+; Possible Values:
+;   static  - a fixed number (pm.max_children) of child processes;
+;   dynamic - the number of child processes are set dynamically based on the
+;             following directives. With this process management, there will be
+;             always at least 1 children.
+;             pm.max_children      - the maximum number of children that can
+;                                    be alive at the same time.
+;             pm.start_servers     - the number of children created on startup.
+;             pm.min_spare_servers - the minimum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is less than this
+;                                    number then some children will be created.
+;             pm.max_spare_servers - the maximum number of children in 'idle'
+;                                    state (waiting to process). If the number
+;                                    of 'idle' processes is greater than this
+;                                    number then some children will be killed.
+;  ondemand - no children are created at startup. Children will be forked when
+;             new requests will connect. The following parameter are used:
+;             pm.max_children           - the maximum number of children that
+;                                         can be alive at the same time.
+;             pm.process_idle_timeout   - The number of seconds after which
+;                                         an idle process will be killed.
+; Note: This value is mandatory.
+pm = dynamic
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI. The below defaults are based on a server without much resources. Don't
+; forget to tweak pm.* to fit your needs.
+; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
+; Note: This value is mandatory.
+pm.max_children = 5
+
+; The number of child processes created on startup.
+; Note: Used only when pm is set to 'dynamic'
+; Default Value: min_spare_servers + (max_spare_servers - min_spare_servers) / 2
+pm.start_servers = 2
+
+; The desired minimum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.min_spare_servers = 1
+
+; The desired maximum number of idle server processes.
+; Note: Used only when pm is set to 'dynamic'
+; Note: Mandatory when pm is set to 'dynamic'
+pm.max_spare_servers = 3
+
+; The number of seconds after which an idle process will be killed.
+; Note: Used only when pm is set to 'ondemand'
+; Default Value: 10s
+;pm.process_idle_timeout = 10s;
+
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries. For
+; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default Value: 0
+;pm.max_requests = 500
+
+; The URI to view the FPM status page. If this value is not set, no URI will be
+; recognized as a status page. It shows the following informations:
+;   pool                 - the name of the pool;
+;   process manager      - static, dynamic or ondemand;
+;   start time           - the date and time FPM has started;
+;   start since          - number of seconds since FPM has started;
+;   accepted conn        - the number of request accepted by the pool;
+;   listen queue         - the number of request in the queue of pending
+;                          connections (see backlog in listen(2));
+;   max listen queue     - the maximum number of requests in the queue
+;                          of pending connections since FPM has started;
+;   listen queue len     - the size of the socket queue of pending connections;
+;   idle processes       - the number of idle processes;
+;   active processes     - the number of active processes;
+;   total processes      - the number of idle + active processes;
+;   max active processes - the maximum number of active processes since FPM
+;                          has started;
+;   max children reached - number of times, the process limit has been reached,
+;                          when pm tries to start more children (works only for
+;                          pm 'dynamic' and 'ondemand');
+; Value are updated in real time.
+; Example output:
+;   pool:                 www
+;   process manager:      static
+;   start time:           01/Jul/2011:17:53:49 +0200
+;   start since:          62636
+;   accepted conn:        190460
+;   listen queue:         0
+;   max listen queue:     1
+;   listen queue len:     42
+;   idle processes:       4
+;   active processes:     11
+;   total processes:      15
+;   max active processes: 12
+;   max children reached: 0
+;
+; By default the status page output is formatted as text/plain. Passing either
+; 'html', 'xml' or 'json' in the query string will return the corresponding
+; output syntax. Example:
+;   http://www.foo.bar/status
+;   http://www.foo.bar/status?json
+;   http://www.foo.bar/status?html
+;   http://www.foo.bar/status?xml
+;
+; By default the status page only outputs short status. Passing 'full' in the
+; query string will also return status for each pool process.
+; Example:
+;   http://www.foo.bar/status?full
+;   http://www.foo.bar/status?json&full
+;   http://www.foo.bar/status?html&full
+;   http://www.foo.bar/status?xml&full
+; The Full status returns for each process:
+;   pid                  - the PID of the process;
+;   state                - the state of the process (Idle, Running, ...);
+;   start time           - the date and time the process has started;
+;   start since          - the number of seconds since the process has started;
+;   requests             - the number of requests the process has served;
+;   request duration     - the duration in µs of the requests;
+;   request method       - the request method (GET, POST, ...);
+;   request URI          - the request URI with the query string;
+;   content length       - the content length of the request (only with POST);
+;   user                 - the user (PHP_AUTH_USER) (or '-' if not set);
+;   script               - the main script called (or '-' if not set);
+;   last request cpu     - the %cpu the last request consumed
+;                          it's always 0 if the process is not in Idle state
+;                          because CPU calculation is done when the request
+;                          processing has terminated;
+;   last request memory  - the max amount of memory the last request consumed
+;                          it's always 0 if the process is not in Idle state
+;                          because memory calculation is done when the request
+;                          processing has terminated;
+; If the process is in Idle state, then informations are related to the
+; last request the process has served. Otherwise informations are related to
+; the current request being served.
+; Example output:
+;   ************************
+;   pid:                  31330
+;   state:                Running
+;   start time:           01/Jul/2011:17:53:49 +0200
+;   start since:          63087
+;   requests:             12808
+;   request duration:     1250261
+;   request method:       GET
+;   request URI:          /test_mem.php?N=10000
+;   content length:       0
+;   user:                 -
+;   script:               /home/fat/web/docs/php/test_mem.php
+;   last request cpu:     0.00
+;   last request memory:  0
+;
+; Note: There is a real-time FPM status monitoring sample web page available
+;       It's available in: /usr/local/share/php/fpm/status.html
+;
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;pm.status_path = /status
+
+; The ping URI to call the monitoring page of FPM. If this value is not set, no
+; URI will be recognized as a ping page. This could be used to test from outside
+; that FPM is alive and responding, or to
+; - create a graph of FPM availability (rrd or such);
+; - remove a server from a group if it is not responding (load balancing);
+; - trigger alerts for the operating team (24/7).
+; Note: The value must start with a leading slash (/). The value can be
+;       anything, but it may not be a good idea to use the .php extension or it
+;       may conflict with a real PHP file.
+; Default Value: not set
+;ping.path = /ping
+
+; This directive may be used to customize the response of a ping request. The
+; response is formatted as text/plain with a 200 response code.
+; Default Value: pong
+;ping.response = pong
+
+; The access log file
+; Default: not set
+;access.log = log/$pool.access.log
+
+; The access log format.
+; The following syntax is allowed
+;  %%: the '%' character
+;  %C: %CPU used by the request
+;      it can accept the following format:
+;      - %{user}C for user CPU only
+;      - %{system}C for system CPU only
+;      - %{total}C  for user + system CPU (default)
+;  %d: time taken to serve the request
+;      it can accept the following format:
+;      - %{seconds}d (default)
+;      - %{miliseconds}d
+;      - %{mili}d
+;      - %{microseconds}d
+;      - %{micro}d
+;  %e: an environment variable (same as $_ENV or $_SERVER)
+;      it must be associated with embraces to specify the name of the env
+;      variable. Some exemples:
+;      - server specifics like: %{REQUEST_METHOD}e or %{SERVER_PROTOCOL}e
+;      - HTTP headers like: %{HTTP_HOST}e or %{HTTP_USER_AGENT}e
+;  %f: script filename
+;  %l: content-length of the request (for POST request only)
+;  %m: request method
+;  %M: peak of memory allocated by PHP
+;      it can accept the following format:
+;      - %{bytes}M (default)
+;      - %{kilobytes}M
+;      - %{kilo}M
+;      - %{megabytes}M
+;      - %{mega}M
+;  %n: pool name
+;  %o: output header
+;      it must be associated with embraces to specify the name of the header:
+;      - %{Content-Type}o
+;      - %{X-Powered-By}o
+;      - %{Transfert-Encoding}o
+;      - ....
+;  %p: PID of the child that serviced the request
+;  %P: PID of the parent of the child that serviced the request
+;  %q: the query string
+;  %Q: the '?' character if query string exists
+;  %r: the request URI (without the query string, see %q and %Q)
+;  %R: remote IP address
+;  %s: status (response code)
+;  %t: server time the request was received
+;      it can accept a strftime(3) format:
+;      %d/%b/%Y:%H:%M:%S %z (default)
+;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
+;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;  %T: time the log has been written (the request has finished)
+;      it can accept a strftime(3) format:
+;      %d/%b/%Y:%H:%M:%S %z (default)
+;      The strftime(3) format must be encapsuled in a %{<strftime_format>}t tag
+;      e.g. for a ISO8601 formatted timestring, use: %{%Y-%m-%dT%H:%M:%S%z}t
+;  %u: remote user
+;
+; Default: "%R - %u %t \"%m %r\" %s"
+;access.format = "%R - %u %t \"%m %r%Q%q\" %s %f %{mili}d %{kilo}M %C%%"
+
+; The log file for slow requests
+; Default Value: not set
+; Note: slowlog is mandatory if request_slowlog_timeout is set
+;slowlog = log/$pool.log.slow
+
+; The timeout for serving a single request after which a PHP backtrace will be
+; dumped to the 'slowlog' file. A value of '0s' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_slowlog_timeout = 0
+
+; The timeout for serving a single request after which the worker process will
+; be killed. This option should be used when the 'max_execution_time' ini option
+; does not stop script execution for some reason. A value of '0' means 'off'.
+; Available units: s(econds)(default), m(inutes), h(ours), or d(ays)
+; Default Value: 0
+;request_terminate_timeout = 0
+
+; Set open file descriptor rlimit.
+; Default Value: system defined value
+;rlimit_files = 1024
+
+; Set max core size rlimit.
+; Possible Values: 'unlimited' or an integer greater or equal to 0
+; Default Value: system defined value
+;rlimit_core = 0
+
+; Chroot to this directory at the start. This value must be defined as an
+; absolute path. When this value is not set, chroot is not used.
+; Note: you can prefix with '$prefix' to chroot to the pool prefix or one
+; of its subdirectories. If the pool prefix is not set, the global prefix
+; will be used instead.
+; Note: chrooting is a great security feature and should be used whenever
+;       possible. However, all PHP paths will be relative to the chroot
+;       (error_log, sessions.save_path, ...).
+; Default Value: not set
+;chroot =
+
+; Chdir to this directory at the start.
+; Note: relative path can be used.
+; Default Value: current directory or / when chroot
+;chdir = /var/www
+
+; Redirect worker stdout and stderr into main error log. If not set, stdout and
+; stderr will be redirected to /dev/null according to FastCGI specs.
+; Note: on highloaded environement, this can cause some delay in the page
+; process time (several ms).
+; Default Value: no
+;catch_workers_output = yes
+
+; Clear environment in FPM workers
+; Prevents arbitrary environment variables from reaching FPM worker processes
+; by clearing the environment in workers before env vars specified in this
+; pool configuration are added.
+; Setting to "no" will make all environment variables available to PHP code
+; via getenv(), $_ENV and $_SERVER.
+; Default Value: yes
+;clear_env = no
+
+; Limits the extensions of the main script FPM will allow to parse. This can
+; prevent configuration mistakes on the web server side. You should only limit
+; FPM to .php extensions to prevent malicious users to use other extensions to
+; exectute php code.
+; Note: set an empty value to allow all extensions.
+; Default Value: .php
+;security.limit_extensions = .php .php3 .php4 .php5 .php7
+
+; Pass environment variables like LD_LIBRARY_PATH. All $VARIABLEs are taken from
+; the current environment.
+; Default Value: clean env
+;env[HOSTNAME] = $HOSTNAME
+;env[PATH] = /usr/local/bin:/usr/bin:/bin
+;env[TMP] = /tmp
+;env[TMPDIR] = /tmp
+;env[TEMP] = /tmp
+
+; Additional php.ini defines, specific to this pool of workers. These settings
+; overwrite the values previously defined in the php.ini. The directives are the
+; same as the PHP SAPI:
+;   php_value/php_flag             - you can set classic ini defines which can
+;                                    be overwritten from PHP call 'ini_set'.
+;   php_admin_value/php_admin_flag - these directives won't be overwritten by
+;                                     PHP call 'ini_set'
+; For php_*flag, valid values are on, off, 1, 0, true, false, yes or no.
+
+; Defining 'extension' will load the corresponding shared extension from
+; extension_dir. Defining 'disable_functions' or 'disable_classes' will not
+; overwrite previously defined php.ini values, but will append the new value
+; instead.
+
+; Note: path INI options can be relative and will be expanded with the prefix
+; (pool, global or /usr/local)
+
+; Default Value: nothing is defined by default except the values in php.ini and
+;                specified at startup with the -d argument
+;php_admin_value[sendmail_path] = /usr/sbin/sendmail -t -i -f www@my.domain.com
+;php_flag[display_errors] = off
+;php_admin_value[error_log] = /var/log/fpm-php.www.log
+;php_admin_flag[log_errors] = on
+;php_admin_value[memory_limit] = 32M