Merge pull request #463 from continuouspipe/feature/allow-enabling-opcache-on-cli

Allow enabling opcache on CLI and enable this + tune magento2

Author: kierenevans

magento2/README.md

@@ -160,3 +160,15 @@ MAGENTO_ENABLE_TRANSLATE_CACHE | If true, enable this cache type in /app/app/etc
 MAGENTO_ENABLE_CONFIG_WEBSERVICE_CACHE | If true, enable this cache type in /app/app/etc/env.php | true/false | true
 MAGENTO_ENABLE_TARGET_RULE_CACHE | If true, enable the target rule cache type in /app/app/etc/env.php. Enterprise edition only. | true/false | true
 MAGENTO_ENTERPRISE_EDITION | If true, this installation of magento is the enterprise edition which allows you to use the target rule cache. | true/false | false
+
+The following variables have had their defaults changed from the php-nginx image so that Magento 2 runs better:
+
+Variable | Description | Expected values | Default
+--- | --- | --- | ----
+PHP_MEMORY_LIMIT | The memory limit for PHP. | string | 768M
+PHP_MAX_EXECUTION_TIME | How long in seconds can a PHP script run for? | integer | 600
+PHP_OPCACHE_MAX_ACCELERATED_FILES | How many files PHP can cache into Opcache | integer | 130987
+PHP_REALPATH_CACHE_SIZE | How many resolved file locations PHP can cache into the realpath cache. | string | 4096K
+PHP_REALPATH_CACHE_TTL | How many seconds can PHP cache the resolved file locations in it's realpath cache | integer | 600
+PHP_OPCACHE_MEMORY_CONSUMPTION | How much memory in megabytes can opcache use? | integer | 512
+PHP_OPCACHE_ENABLE_CLI | Should opcache be enabled on the PHP CLI? | 0/1 | 1

magento2/usr/local/share/env/30-framework

@@ -5,10 +5,11 @@ export IMAGE_VERSION=${IMAGE_VERSION:-1}
 export PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT:-768M}
 export PHP_MAX_EXECUTION_TIME=${PHP_MAX_EXECUTION_TIME:-600}
 
-export PHP_OPCACHE_MAX_ACCELERATED_FILES=${PHP_OPCACHE_MAX_ACCELERATED_FILES:-16384}
+export PHP_OPCACHE_MAX_ACCELERATED_FILES=${PHP_OPCACHE_MAX_ACCELERATED_FILES:-130987}
 export PHP_REALPATH_CACHE_SIZE=${PHP_REALPATH_CACHE_SIZE:-4096K}
 export PHP_REALPATH_CACHE_TTL=${PHP_REALPATH_CACHE_TTL:-600}
-export PHP_OPCACHE_MEMORY_CONSUMPTION=${PHP_OPCACHE_MEMORY_CONSUMPTION:-256}
+export PHP_OPCACHE_MEMORY_CONSUMPTION=${PHP_OPCACHE_MEMORY_CONSUMPTION:-512}
+export PHP_OPCACHE_ENABLE_CLI=${PHP_OPCACHE_ENABLE_CLI:1}
 
 PRODUCTION_ENVIRONMENT=${PRODUCTION_ENVIRONMENT:-false}
 PRODUCTION_ENVIRONMENT="$(convert_to_boolean_string "$PRODUCTION_ENVIRONMENT")"

php/apache/README.md

@@ -162,6 +162,7 @@ PHP_MEMORY_LIMIT_CLI | The PHP Memoery Limit on the Command Line | Integers and
 PHP_OPCACHE_MAX_ACCELERATED_FILES | The amount of files to cache the opcodes for. | integer | 2000
 PHP_OPCACHE_MEMORY_CONSUMPTION | The amount of megabytes that the opcode cache is allowed to use | integer | 64
 PHP_OPCACHE_VALIDATE_TIMESTAMPS | If PHP should use the cache directly or first check if the file has been modified, where 0 means don't check files. This will automatically be set to 0 if DEVELOPMENT_MODE is "false" | 0/1 | 0 if DEVELOPMENT_MODE is false, 1 otherwise
+PHP_OPCACHE_ENABLE_CLI | Should opcache be enabled on the PHP CLI? | 0/1 | 0
 PHP_REALPATH_CACHE_SIZE | The amount of bytes used for the cache of fully resolved file paths | Integer and a unit (K for Kilobytes/M for Megabytes/G for Gigabytes) | 16K
 PHP_REALPATH_CACHE_TTL | The amount of seconds to cache the fully resolved file paths for | integer | 120
 DEVELOPMENT_MODE | If set to "false", composer will run with the "--no-dev" flag to not bring in development dependencies. If set to "true", development dependencies will be brought in | true/false | false

php/nginx/README.md

@@ -171,6 +171,7 @@ PHP_MEMORY_LIMIT_CLI | The PHP Memoery Limit on the Command Line | Integers and
 PHP_OPCACHE_MAX_ACCELERATED_FILES | The amount of files to cache the opcodes for. | integer | 2000
 PHP_OPCACHE_MEMORY_CONSUMPTION | The amount of megabytes that the opcode cache is allowed to use | integer | 64
 PHP_OPCACHE_VALIDATE_TIMESTAMPS | If PHP should use the cache directly or first check if the file has been modified, where 0 means don't check files. This will automatically be set to 0 if DEVELOPMENT_MODE is "false" | 0/1 | 0 if DEVELOPMENT_MODE is false, 1 otherwise
+PHP_OPCACHE_ENABLE_CLI | Should opcache be enabled on the PHP CLI? | 0/1 | 0
 PHP_REALPATH_CACHE_SIZE | The amount of bytes used for the cache of fully resolved file paths | Integer and a unit (K for Kilobytes/M for Megabytes/G for Gigabytes) | 16K
 PHP_REALPATH_CACHE_TTL | The amount of seconds to cache the fully resolved file paths for | integer | 120
 DEVELOPMENT_MODE | If set to "false", composer will run with the "--no-dev" flag to not bring in development dependencies. If set to "true", development dependencies will be brought in | true/false | false

php/shared/etc/confd/templates/php/env.ini.tmpl

@@ -5,6 +5,7 @@ memory_limit = {{ getenv "PHP_MEMORY_LIMIT_CLI" }}
 opcache.max_accelerated_files = {{ getenv "PHP_OPCACHE_MAX_ACCELERATED_FILES" }}
 opcache.memory_consumption = {{ getenv "PHP_OPCACHE_MEMORY_CONSUMPTION" }}
 opcache.validate_timestamps = {{ getenv "PHP_OPCACHE_VALIDATE_TIMESTAMPS" }}
+opcache.enable_cli = {{ getenv "PHP_OPCACHE_ENABLE_CLI" }}
 realpath_cache_size = {{ getenv "PHP_REALPATH_CACHE_SIZE" }}
 realpath_cache_ttl={{ getenv "PHP_REALPATH_CACHE_TTL" }}
 expose_php = Off

php/shared/usr/local/share/env/40-stack

@@ -9,6 +9,7 @@ export PHP_MEMORY_LIMIT=${PHP_MEMORY_LIMIT:-256M}
 export PHP_OPCACHE_MAX_ACCELERATED_FILES=${PHP_OPCACHE_MAX_ACCELERATED_FILES:-2000}
 export PHP_OPCACHE_MEMORY_CONSUMPTION=${PHP_OPCACHE_MEMORY_CONSUMPTION:-64}
 export PHP_OPCACHE_VALIDATE_TIMESTAMPS=${PHP_OPCACHE_VALIDATE_TIMESTAMPS:-1}
+export PHP_OPCACHE_ENABLE_CLI=${PHP_OPCACHE_ENABLE_CLI:0}
 export PHP_REALPATH_CACHE_SIZE=${PHP_REALPATH_CACHE_SIZE:-16K}
 export PHP_REALPATH_CACHE_TTL=${PHP_REALPATH_CACHE_TTL:-120}