Merge remote-tracking branch 'origin/2.5'

alongosz · Oct 18, 2019 · c371075 · c371075
2 parents ea31635 + 5a63d04
commit c371075
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 0 deletions.
diff --git a/doc/docker/base-dev.yml b/doc/docker/base-dev.yml
@@ -11,6 +11,7 @@ services:
      - db
     environment:
      - COMPOSER_MEMORY_LIMIT
+     - PHP_INI_ENV_memory_limit
      - APP_ENV=${APP_ENV-dev}
      - APP_DEBUG
      - APP_HTTP_CACHE

diff --git a/doc/docker/base-prod.yml b/doc/docker/base-prod.yml
@@ -12,6 +12,7 @@ services:
      - db
     environment:
      - COMPOSER_MEMORY_LIMIT
+     - PHP_INI_ENV_memory_limit
      - APP_ENV=${APP_ENV-prod}
      - APP_DEBUG
      - APP_HTTP_CACHE