Browse Source

Releasing version 15.0.0, NodeJS & npm added to PHP, new PHP 7.2 image

Mark Shust 6 years ago
parent
commit
7bdd466f55
45 changed files with 634 additions and 55 deletions
  1. 11 0
      CHANGELOG.md
  2. 12 3
      README.md
  3. 1 1
      compose/magento-1/bin/bash
  4. 1 1
      compose/magento-1/bin/composer
  5. 3 3
      compose/magento-1/bin/fixperms
  6. 2 0
      compose/magento-1/bin/grunt
  7. 1 1
      compose/magento-1/bin/mage
  8. 2 0
      compose/magento-1/bin/node
  9. 2 0
      compose/magento-1/bin/npm
  10. 2 0
      compose/magento-1/bin/stop
  11. 2 2
      compose/magento-1/bin/xdebug
  12. 3 3
      compose/magento-1/docker-compose.yml
  13. 1 1
      compose/magento-2-windows/bin/bash.ps1
  14. 1 1
      compose/magento-2-windows/bin/composer.ps1
  15. 1 1
      compose/magento-2-windows/bin/copymagento.ps1
  16. 4 4
      compose/magento-2-windows/bin/fixperms.ps1
  17. 1 0
      compose/magento-2-windows/bin/grunt.ps1
  18. 1 1
      compose/magento-2-windows/bin/magento.ps1
  19. 1 0
      compose/magento-2-windows/bin/node.ps1
  20. 1 0
      compose/magento-2-windows/bin/npm.ps1
  21. 0 6
      compose/magento-2-windows/bin/rootcli.ps1
  22. 6 6
      compose/magento-2-windows/bin/setup.ps1
  23. 1 0
      compose/magento-2-windows/bin/stop.ps1
  24. 2 2
      compose/magento-2-windows/bin/xdebug.ps1
  25. 3 3
      compose/magento-2-windows/docker-compose.yml
  26. 1 1
      compose/magento-2/bin/bash
  27. 1 1
      compose/magento-2/bin/composer
  28. 1 1
      compose/magento-2/bin/dev-urn-catalog-generate
  29. 3 3
      compose/magento-2/bin/fixperms
  30. 2 0
      compose/magento-2/bin/grunt
  31. 1 1
      compose/magento-2/bin/magento
  32. 2 0
      compose/magento-2/bin/node
  33. 2 0
      compose/magento-2/bin/npm
  34. 4 4
      compose/magento-2/bin/setup
  35. 2 0
      compose/magento-2/bin/stop
  36. 2 2
      compose/magento-2/bin/xdebug
  37. 3 3
      compose/magento-2/docker-compose.yml
  38. 5 0
      images/php/5.6/Dockerfile
  39. 5 0
      images/php/7.0/Dockerfile
  40. 5 0
      images/php/7.1/Dockerfile
  41. 67 0
      images/php/7.2/Dockerfile
  42. 7 0
      images/php/7.2/bin/cronstart
  43. 31 0
      images/php/7.2/conf/php-fpm.conf
  44. 12 0
      images/php/7.2/conf/php.ini
  45. 413 0
      images/php/7.2/conf/www.conf

+ 11 - 0
CHANGELOG.md

@@ -6,6 +6,17 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 
 ## [Unreleased]
 ## [Unreleased]
 
 
+## [15.0.0] - 2018-08-03
+
+### Added
+- NodeJS 8 and npm 5 added to the PHP images!
+- New PHP 7.2 image. Be aware that this hasn't yet been fully tested.
+- New helper scripts bin/grunt, bin/node, bin/npm and bin/stop.
+
+### Changed
+- All bin helper script calls from ./bin/name to bin/name.
+- Updated bin scripts for Windows, possible breaking updates.
+
 ## [14.0.1] - 2018-07-28
 ## [14.0.1] - 2018-07-28
 
 
 ### Fixed
 ### Fixed

+ 12 - 3
README.md

@@ -11,18 +11,23 @@ View Dockerfiles:
 		- [`1.13-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/nginx/1.13)
 		- [`1.13-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/nginx/1.13)
 		- [`1.13-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/nginx/1.13)
 		- [`1.13-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/nginx/1.13)
 - [markoshust/magento-php (Docker Hub)](https://hub.docker.com/r/markoshust/magento-php/)
 - [markoshust/magento-php (Docker Hub)](https://hub.docker.com/r/markoshust/magento-php/)
+        - 7.2
+                - [`dev`, `7.2-fpm`, `7.2-fpm-0`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.2)
 	- 7.1
 	- 7.1
-		- [`latest`, `7.1-fpm`, `7.1-fpm-3`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.1)
+		- [`latest`, `7.1-fpm`, `7.1-fpm-4`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.1)
+                - [`7.1-fpm-3`](https://github.com/markoshust/docker-magento/tree/14.0.1/images/php/7.1)
 		- [`7.1-fpm-2`](https://github.com/markoshust/docker-magento/tree/13.0.0/images/php/7.1)
 		- [`7.1-fpm-2`](https://github.com/markoshust/docker-magento/tree/13.0.0/images/php/7.1)
 		- [`7.1-fpm-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/php/7.1)
 		- [`7.1-fpm-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/php/7.1)
 		- [`7.1-fpm-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/php/7.1)
 		- [`7.1-fpm-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/php/7.1)
 	- 7.0
 	- 7.0
-		- [`7.0-fpm`, `7.0-fpm-3`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.0)
+		- [`7.0-fpm`, `7.0-fpm-4`](https://github.com/markoshust/docker-magento/tree/master/images/php/7.0)
+                - [`7.0-fpm-3`](https://github.com/markoshust/docker-magento/tree/14.0.1/images/php/7.0)
 		- [`7.0-fpm-2`](https://github.com/markoshust/docker-magento/tree/13.0.0/images/php/7.0)
 		- [`7.0-fpm-2`](https://github.com/markoshust/docker-magento/tree/13.0.0/images/php/7.0)
 		- [`7.0-fpm-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/php/7.0)
 		- [`7.0-fpm-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/php/7.0)
 		- [`7.0-fpm-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/php/7.0)
 		- [`7.0-fpm-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/php/7.0)
 	- 5.6
 	- 5.6
-		- [`5.6-fpm`, `5.6-fpm-3`](https://github.com/markoshust/docker-magento/tree/master/images/php/5.6)
+		- [`5.6-fpm`, `5.6-fpm-4`](https://github.com/markoshust/docker-magento/tree/master/images/php/5.6)
+                - [`5.6-fpm-3`](https://github.com/markoshust/docker-magento/tree/14.0.1/images/php/5.6)
 		- [`5.6-fpm-2`](https://github.com/markoshust/docker-magento/tree/13.0.0/images/php/5.6)
 		- [`5.6-fpm-2`](https://github.com/markoshust/docker-magento/tree/13.0.0/images/php/5.6)
 		- [`5.6-fpm-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/php/5.6)
 		- [`5.6-fpm-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/php/5.6)
 		- [`5.6-fpm-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/php/5.6)
 		- [`5.6-fpm-0`](https://github.com/markoshust/docker-magento/tree/11.0.0/images/php/5.6)
@@ -117,11 +122,15 @@ See the `compose` folder for sample setups for both Magento 1 and Magento 2. Bas
 - `bin/composer`: Run the composer binary. Ex. `bin/composer install`
 - `bin/composer`: Run the composer binary. Ex. `bin/composer install`
 - `bin/download`: Download a version of Magento to the `src` directory. Ex. `bin/download 2.2.2`
 - `bin/download`: Download a version of Magento to the `src` directory. Ex. `bin/download 2.2.2`
 - `bin/fixperms`: This will fix filesystem ownerships and permissions within Docker.
 - `bin/fixperms`: This will fix filesystem ownerships and permissions within Docker.
+- `bin/grunt`: Run the grunt binary. Note that this runs the version from the node_modules directory for project version parity. Ex. `bin/grunt exec`
 - `bin/initloopback`: Setup your ip loopback for proper Docker ip resolution.
 - `bin/initloopback`: Setup your ip loopback for proper Docker ip resolution.
 - `bin/magento`: Run the Magento CLI. Ex: `bin/magento cache:flush`
 - `bin/magento`: Run the Magento CLI. Ex: `bin/magento cache:flush`
+- `bin/node`: Run the node binary. Ex. `bin/node --version`
+- `bin/npm`: Run the npm binary. Ex. `bin/npm install`
 - `bin/root`: Run any CLI command as root without going into the bash prompt. Ex `bin/root apt-get install nano`
 - `bin/root`: Run any CLI command as root without going into the bash prompt. Ex `bin/root apt-get install nano`
 - `bin/setup`: Run the Magento setup process to install Magento from the source code.
 - `bin/setup`: Run the Magento setup process to install Magento from the source code.
 - `bin/start`: Start the Docker Compose process and your app. Ctrl+C to stop the process.
 - `bin/start`: Start the Docker Compose process and your app. Ctrl+C to stop the process.
+- `bin/stop`: Stop the Docker Compose process and your app. Use if Ctrl+C isn't working or to stop the containers from another shell.
 - `bin/xdebug`: Disable or enable Xdebug. Ex. `bin/xdebug enable`
 - `bin/xdebug`: Disable or enable Xdebug. Ex. `bin/xdebug enable`
 
 
 ## Misc Info
 ## Misc Info

+ 1 - 1
compose/magento-1/bin/bash

@@ -1,2 +1,2 @@
 #!/bin/bash
 #!/bin/bash
-./bin/cli bash
+bin/cli bash

+ 1 - 1
compose/magento-1/bin/composer

@@ -1,2 +1,2 @@
 #!/bin/bash
 #!/bin/bash
-./bin/cli composer "$@"
+bin/cli composer "$@"

+ 3 - 3
compose/magento-1/bin/fixperms

@@ -1,8 +1,8 @@
 #!/bin/bash
 #!/bin/bash
 echo "Correcting filesystem permissions..."
 echo "Correcting filesystem permissions..."
 
 
-./bin/cli find media var -type f -exec chmod u+w {} \;
-./bin/cli find media var -type d -exec chmod u+w {} \;
-./bin/cli chmod u+x mage
+bin/cli find media var -type f -exec chmod u+w {} \;
+bin/cli find media var -type d -exec chmod u+w {} \;
+bin/cli chmod u+x mage
 
 
 echo "Filesystem permissions corrected."
 echo "Filesystem permissions corrected."

+ 2 - 0
compose/magento-1/bin/grunt

@@ -0,0 +1,2 @@
+#!/bin/bash
+bin/cli node_modules/grunt/bin/grunt "$@"

+ 1 - 1
compose/magento-1/bin/mage

@@ -1,2 +1,2 @@
 #!/bin/bash
 #!/bin/bash
-./bin/cli ./mage "$@"
+bin/cli mage "$@"

+ 2 - 0
compose/magento-1/bin/node

@@ -0,0 +1,2 @@
+#!/bin/bash
+bin/cli node "$@"

+ 2 - 0
compose/magento-1/bin/npm

@@ -0,0 +1,2 @@
+#!/bin/bash
+bin/cli npm "$@"

+ 2 - 0
compose/magento-1/bin/stop

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker-compose stop

+ 2 - 2
compose/magento-1/bin/xdebug

@@ -1,9 +1,9 @@
 #!/bin/bash
 #!/bin/bash
 if [ "$1" == "disable" ]; then
 if [ "$1" == "disable" ]; then
-  ./bin/cli sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  bin/cli sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
   echo "Xdebug has been disabled."
   echo "Xdebug has been disabled."
 elif [ "$1" == "enable" ]; then
 elif [ "$1" == "enable" ]; then
-  ./bin/cli sed -i -e 's/^\;zend_extension/zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  bin/cli sed -i -e 's/^\;zend_extension/zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
   echo "Xdebug has been enabled."
   echo "Xdebug has been enabled."
 else
 else
   echo "Please specify either 'enable' or 'disable' as an argument"
   echo "Please specify either 'enable' or 'disable' as an argument"

+ 3 - 3
compose/magento-1/docker-compose.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 14.0.0
+# Version 15.0.0
 
 
 version: "3"
 version: "3"
 
 
@@ -18,14 +18,14 @@ services:
       - sockdata:/sock
       - sockdata:/sock
 
 
   phpfpm:
   phpfpm:
-    image: markoshust/magento-php:5.6-fpm-3
+    image: markoshust/magento-php:5.6-fpm-4
     links:
     links:
       - db
       - db
     volumes: *appvolumes
     volumes: *appvolumes
 
 
   # Disabling cron by default as it uses higher CPU, enable if needed
   # Disabling cron by default as it uses higher CPU, enable if needed
   #cron:
   #cron:
-  #  image: markoshust/magento-php:5.6-fpm-3
+  #  image: markoshust/magento-php:5.6-fpm-4
   #  user: root
   #  user: root
   #  command: /usr/local/bin/cronstart
   #  command: /usr/local/bin/cronstart
   #  tty: true
   #  tty: true

+ 1 - 1
compose/magento-2-windows/bin/bash.ps1

@@ -1 +1 @@
-./bin/cli bash
+bin/cli bash

+ 1 - 1
compose/magento-2-windows/bin/composer.ps1

@@ -1 +1 @@
-docker-compose exec phpfpm composer $args
+bin/cli composer $args

+ 1 - 1
compose/magento-2-windows/bin/copymagento.ps1

@@ -1 +1 @@
-docker-compose run --user=root --no-deps --rm -v $PWD/src/.:/source phpfpm cp -r /source/. /var/www/html
+docker-compose run --user=root --no-deps --rm -v $PWD/src/.:/source phpfpm cp -r /src/. /var/www/html

+ 4 - 4
compose/magento-2-windows/bin/fixperms.ps1

@@ -1,8 +1,8 @@
 Write-Host "Correcting filesystem permissions..."
 Write-Host "Correcting filesystem permissions..."
 
 
-./bin/rootcli chown -R app:app /var/www
-./bin/rootcli find var vendor pub/static pub/media app/etc -type f -exec chmod u+w `{`} `;
-./bin/rootcli find var vendor pub/static pub/media app/etc -type d -exec chmod u+w `{`} `;
-./bin/rootcli chmod u+x bin/magento
+bin/rootcli chown -R app:app /var/www
+bin/rootcli find var vendor pub/static pub/media app/etc -type f -exec chmod u+w `{`} `;
+bin/rootcli find var vendor pub/static pub/media app/etc -type d -exec chmod u+w `{`} `;
+bin/rootcli chmod u+x bin/magento
 
 
 Write-Host "Filesystem permissions corrected."
 Write-Host "Filesystem permissions corrected."

+ 1 - 0
compose/magento-2-windows/bin/grunt.ps1

@@ -0,0 +1 @@
+bin/cli node_modules/grunt/bin/grunt $args

+ 1 - 1
compose/magento-2-windows/bin/magento.ps1

@@ -1 +1 @@
-docker-compose exec phpfpm ./bin/magento $args
+bin/cli bin/magento $args

+ 1 - 0
compose/magento-2-windows/bin/node.ps1

@@ -0,0 +1 @@
+bin/cli node $args

+ 1 - 0
compose/magento-2-windows/bin/npm.ps1

@@ -0,0 +1 @@
+bin/cli npm $args

+ 0 - 6
compose/magento-2-windows/bin/rootcli.ps1

@@ -1,6 +0,0 @@
-if ($args.length -eq 0) {
-    Write-Host "Please specify a CLI command (ex. ls)"
-    exit
-} else {
-    docker-compose exec --user=root phpfpm $args
-}

+ 6 - 6
compose/magento-2-windows/bin/setup.ps1

@@ -1,6 +1,6 @@
-./bin/cli chmod u+x bin/magento
+bin/cli chmod u+x bin/magento
 
 
-docker-compose exec phpfpm /usr/local/bin/php ./bin/magento setup:install `
+docker-compose exec phpfpm /usr/local/bin/php bin/magento setup:install `
   --db-host=db `
   --db-host=db `
   --db-name=magento `
   --db-name=magento `
   --db-user=magento `
   --db-user=magento `
@@ -16,11 +16,11 @@ docker-compose exec phpfpm /usr/local/bin/php ./bin/magento setup:install `
   --timezone=America/New_York `
   --timezone=America/New_York `
   --use-rewrites=1
   --use-rewrites=1
 
 
-./bin/fixperms
+bin/fixperms
 
 
 echo "Turning on developer mode.."
 echo "Turning on developer mode.."
-./bin/magento deploy:mode:set developer
+bin/magento deploy:mode:set developer
 
 
-./bin/magento indexer:reindex
+bin/magento indexer:reindex
 
 
-./bin/magento cache:enable
+bin/magento cache:enable

+ 1 - 0
compose/magento-2-windows/bin/stop.ps1

@@ -0,0 +1 @@
+docker-compose stop

+ 2 - 2
compose/magento-2-windows/bin/xdebug.ps1

@@ -4,10 +4,10 @@ Param(
   [string]$enable_disable_xdebug
   [string]$enable_disable_xdebug
 )
 )
 if ( "$enable_disable_xdebug" -eq "disable" ) {
 if ( "$enable_disable_xdebug" -eq "disable" ) {
-  ./bin/cli sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  bin/cli sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
   Write-Host "Xdebug has been disabled."
   Write-Host "Xdebug has been disabled."
 } elseif ( "$enable_disable_xdebug" -eq "enable" ) {
 } elseif ( "$enable_disable_xdebug" -eq "enable" ) {
-  ./bin/cli sed -i -e 's/^\;zend_extension/zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  bin/cli sed -i -e 's/^\;zend_extension/zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
   Write-Host "Xdebug has been enabled."
   Write-Host "Xdebug has been enabled."
 } else {
 } else {
   Write-Host "Please specify either 'enable' or 'disable' as an argument"
   Write-Host "Please specify either 'enable' or 'disable' as an argument"

+ 3 - 3
compose/magento-2-windows/docker-compose.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 14.0.1
+# Version 15.0.0
 
 
 version: "3"
 version: "3"
 
 
@@ -21,14 +21,14 @@ services:
       - sockdata:/sock
       - sockdata:/sock
 
 
   phpfpm:
   phpfpm:
-    image: markoshust/magento-php:7.1-fpm-3
+    image: markoshust/magento-php:7.1-fpm-4
     links:
     links:
       - db
       - db
     volumes: *appvolumes
     volumes: *appvolumes
 
 
   # Disabling cron by default as it uses higher CPU, enable if needed
   # Disabling cron by default as it uses higher CPU, enable if needed
   #cron:
   #cron:
-  #  image: markoshust/magento-php:7.1-fpm-3
+  #  image: markoshust/magento-php:7.1-fpm-4
   #  user: root
   #  user: root
   #  command: /usr/local/bin/cronstart
   #  command: /usr/local/bin/cronstart
   #  tty: true
   #  tty: true

+ 1 - 1
compose/magento-2/bin/bash

@@ -1,2 +1,2 @@
 #!/bin/bash
 #!/bin/bash
-./bin/cli bash
+bin/cli bash

+ 1 - 1
compose/magento-2/bin/composer

@@ -1,2 +1,2 @@
 #!/bin/bash
 #!/bin/bash
-./bin/cli composer "$@"
+bin/cli composer "$@"

+ 1 - 1
compose/magento-2/bin/dev-urn-catalog-generate

@@ -1,5 +1,5 @@
 #!/bin/bash
 #!/bin/bash
-./bin/magento dev:urn-catalog:generate misc.xml
+bin/magento dev:urn-catalog:generate misc.xml
 
 
 sed -i .bak 's?/var/www/html?'`pwd`/src'?' src/misc.xml
 sed -i .bak 's?/var/www/html?'`pwd`/src'?' src/misc.xml
 rm src/misc.xml.bak
 rm src/misc.xml.bak

+ 3 - 3
compose/magento-2/bin/fixperms

@@ -1,8 +1,8 @@
 #!/bin/bash
 #!/bin/bash
 echo "Correcting filesystem permissions..."
 echo "Correcting filesystem permissions..."
 
 
-./bin/cli find var vendor pub/static pub/media app/etc -type f -exec chmod u+w {} \;
-./bin/cli find var vendor pub/static pub/media app/etc -type d -exec chmod u+w {} \;
-./bin/cli chmod u+x bin/magento
+bin/cli find var vendor pub/static pub/media app/etc -type f -exec chmod u+w {} \;
+bin/cli find var vendor pub/static pub/media app/etc -type d -exec chmod u+w {} \;
+bin/cli chmod u+x bin/magento
 
 
 echo "Filesystem permissions corrected."
 echo "Filesystem permissions corrected."

+ 2 - 0
compose/magento-2/bin/grunt

@@ -0,0 +1,2 @@
+#!/bin/bash
+bin/cli node_modules/grunt/bin/grunt "$@"

+ 1 - 1
compose/magento-2/bin/magento

@@ -1,2 +1,2 @@
 #!/bin/bash
 #!/bin/bash
-./bin/cli ./bin/magento "$@"
+bin/cli bin/magento "$@"

+ 2 - 0
compose/magento-2/bin/node

@@ -0,0 +1,2 @@
+#!/bin/bash
+bin/cli node "$@"

+ 2 - 0
compose/magento-2/bin/npm

@@ -0,0 +1,2 @@
+#!/bin/bash
+bin/cli npm "$@"

+ 4 - 4
compose/magento-2/bin/setup

@@ -1,5 +1,5 @@
 #!/bin/bash
 #!/bin/bash
-./bin/cli chmod u+x bin/magento
+bin/cli chmod u+x bin/magento
 
 
 docker-compose exec phpfpm /usr/local/bin/php ./bin/magento setup:install \
 docker-compose exec phpfpm /usr/local/bin/php ./bin/magento setup:install \
   --db-host=db \
   --db-host=db \
@@ -17,9 +17,9 @@ docker-compose exec phpfpm /usr/local/bin/php ./bin/magento setup:install \
   --timezone=America/New_York \
   --timezone=America/New_York \
   --use-rewrites=1
   --use-rewrites=1
 
 
-./bin/fixperms
+bin/fixperms
 
 
 echo "Turning on developer mode.."
 echo "Turning on developer mode.."
-./bin/magento deploy:mode:set developer
+bin/magento deploy:mode:set developer
 
 
-./bin/magento indexer:reindex
+bin/magento indexer:reindex

+ 2 - 0
compose/magento-2/bin/stop

@@ -0,0 +1,2 @@
+#!/bin/bash
+docker-compose stop

+ 2 - 2
compose/magento-2/bin/xdebug

@@ -1,9 +1,9 @@
 #!/bin/bash
 #!/bin/bash
 if [ "$1" == "disable" ]; then
 if [ "$1" == "disable" ]; then
-  ./bin/cli sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  bin/cli sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
   echo "Xdebug has been disabled."
   echo "Xdebug has been disabled."
 elif [ "$1" == "enable" ]; then
 elif [ "$1" == "enable" ]; then
-  ./bin/cli sed -i -e 's/^\;zend_extension/zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+  bin/cli sed -i -e 's/^\;zend_extension/zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
   echo "Xdebug has been enabled."
   echo "Xdebug has been enabled."
 else
 else
   echo "Please specify either 'enable' or 'disable' as an argument"
   echo "Please specify either 'enable' or 'disable' as an argument"

+ 3 - 3
compose/magento-2/docker-compose.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 14.0.1
+# Version 15.0.0
 
 
 version: "3"
 version: "3"
 
 
@@ -20,14 +20,14 @@ services:
       - sockdata:/sock
       - sockdata:/sock
 
 
   phpfpm:
   phpfpm:
-    image: markoshust/magento-php:7.1-fpm-3
+    image: markoshust/magento-php:7.1-fpm-4
     links:
     links:
       - db
       - db
     volumes: *appvolumes
     volumes: *appvolumes
 
 
   # Disabling cron by default as it uses higher CPU, enable if needed
   # Disabling cron by default as it uses higher CPU, enable if needed
   #cron:
   #cron:
-  #  image: markoshust/magento-php:7.1-fpm-3
+  #  image: markoshust/magento-php:7.1-fpm-4
   #  user: root
   #  user: root
   #  command: /usr/local/bin/cronstart
   #  command: /usr/local/bin/cronstart
   #  tty: true
   #  tty: true

+ 5 - 0
images/php/5.6/Dockerfile

@@ -39,6 +39,11 @@ RUN pecl channel-update pecl.php.net \
 RUN curl -sS https://getcomposer.org/installer | \
 RUN curl -sS https://getcomposer.org/installer | \
   php -- --install-dir=/usr/local/bin --filename=composer
   php -- --install-dir=/usr/local/bin --filename=composer
 
 
+RUN apt-get install -y gnupg \
+  && curl -sL https://deb.nodesource.com/setup_8.x | bash - \
+  && apt-get install -y nodejs \
+  && ln -s /var/www/html/node_modules/grunt/bin/grunt /usr/bin/grunt
+
 RUN groupadd -g 1000 app \
 RUN groupadd -g 1000 app \
  && useradd -g 1000 -u 1000 -d /var/www -s /bin/bash app
  && useradd -g 1000 -u 1000 -d /var/www -s /bin/bash app
 
 

+ 5 - 0
images/php/7.0/Dockerfile

@@ -39,6 +39,11 @@ RUN pecl channel-update pecl.php.net \
 RUN curl -sS https://getcomposer.org/installer | \
 RUN curl -sS https://getcomposer.org/installer | \
   php -- --install-dir=/usr/local/bin --filename=composer
   php -- --install-dir=/usr/local/bin --filename=composer
 
 
+RUN apt-get install -y gnupg \
+  && curl -sL https://deb.nodesource.com/setup_8.x | bash - \
+  && apt-get install -y nodejs \
+  && ln -s /var/www/html/node_modules/grunt/bin/grunt /usr/bin/grunt
+
 RUN groupadd -g 1000 app \
 RUN groupadd -g 1000 app \
  && useradd -g 1000 -u 1000 -d /var/www -s /bin/bash app
  && useradd -g 1000 -u 1000 -d /var/www -s /bin/bash app
 
 

+ 5 - 0
images/php/7.1/Dockerfile

@@ -39,6 +39,11 @@ RUN pecl channel-update pecl.php.net \
 RUN curl -sS https://getcomposer.org/installer | \
 RUN curl -sS https://getcomposer.org/installer | \
   php -- --install-dir=/usr/local/bin --filename=composer
   php -- --install-dir=/usr/local/bin --filename=composer
 
 
+RUN apt-get install -y gnupg \
+  && curl -sL https://deb.nodesource.com/setup_8.x | bash - \
+  && apt-get install -y nodejs \
+  && ln -s /var/www/html/node_modules/grunt/bin/grunt /usr/bin/grunt
+
 RUN groupadd -g 1000 app \
 RUN groupadd -g 1000 app \
  && useradd -g 1000 -u 1000 -d /var/www -s /bin/bash app
  && useradd -g 1000 -u 1000 -d /var/www -s /bin/bash app
 
 

+ 67 - 0
images/php/7.2/Dockerfile

@@ -0,0 +1,67 @@
+FROM php:7.2-fpm
+MAINTAINER Mark Shust <mark@shust.com>
+
+RUN apt-get update && apt-get install -y \
+  cron \
+  git \
+  gzip \
+  libfreetype6-dev \
+  libicu-dev \
+  libjpeg62-turbo-dev \
+  libmcrypt-dev \
+  libpng-dev \
+  libxslt1-dev \
+  lsof \
+  mysql-client \
+  vim \
+  zip
+
+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 \
+  opcache \
+  pdo_mysql \
+  soap \
+  xsl \
+  zip
+
+RUN pecl channel-update pecl.php.net \
+  && pecl install xdebug \
+  && docker-php-ext-enable xdebug \
+  && sed -i -e 's/^zend_extension/\;zend_extension/g' /usr/local/etc/php/conf.d/docker-php-ext-xdebug.ini
+
+RUN curl -sS https://getcomposer.org/installer | \
+  php -- --install-dir=/usr/local/bin --filename=composer
+
+RUN apt-get install -y gnupg \
+  && curl -sL https://deb.nodesource.com/setup_8.x | bash - \
+  && apt-get install -y nodejs \
+  && ln -s /var/www/html/node_modules/grunt/bin/grunt /usr/bin/grunt
+
+RUN groupadd -g 1000 app \
+ && useradd -g 1000 -u 1000 -d /var/www -s /bin/bash app
+
+RUN printf '* *\t* * *\tapp\t%s/usr/local/bin/php /var/www/html/update/cron.php\n' >> /etc/crontab
+RUN printf '* *\t* * *\tapp\t%s/usr/local/bin/php /var/www/html/bin/magento cron:run\n' >> /etc/crontab
+RUN printf '* *\t* * *\tapp\t%s/usr/local/bin/php /var/www/html/bin/magento setup:cron:run\n#\n' >> /etc/crontab
+
+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/cronstart /usr/local/bin/
+
+RUN mkdir /sock
+RUN chown -R app:app /usr/local/etc/php/conf.d /sock
+
+USER app:app
+
+VOLUME /var/www
+
+WORKDIR /var/www/html
+
+EXPOSE 9001

+ 7 - 0
images/php/7.2/bin/cronstart

@@ -0,0 +1,7 @@
+#!/bin/bash
+service cron start
+
+touch /var/www/html/var/.setup_cronjob_status /var/www/html/var/.update_cronjob_status
+chown app:app /var/www/html/var/.setup_cronjob_status /var/www/html/var/.update_cronjob_status
+
+/usr/bin/crontab

+ 31 - 0
images/php/7.2/conf/php-fpm.conf

@@ -0,0 +1,31 @@
+; 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 = app
+;group = app
+
+listen = /sock/docker.sock
+listen.owner = app
+listen.group = app
+listen.mode = 0660
+
+pm = dynamic
+pm.max_children = 10
+pm.start_servers = 4
+pm.min_spare_servers = 2
+pm.max_spare_servers = 6
+
+clear_env = no
+
+; Ensure worker stdout and stderr are sent to the main error log.
+catch_workers_output = yes

+ 12 - 0
images/php/7.2/conf/php.ini

@@ -0,0 +1,12 @@
+memory_limit = 2G
+max_execution_time = 1800
+zlib.output_compression = On
+cgi.fix_pathinfo = 0
+date.timezone = UTC
+
+xdebug.idekey = PHPSTORM
+xdebug.remote_autostart = 1
+xdebug.remote_connect_back = 0
+xdebug.remote_enable = 1
+xdebug.remote_host = 10.254.254.254
+xdebug.remote_port = 9001

+ 413 - 0
images/php/7.2/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 = app
+group = app
+
+; 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