Merge remote-tracking branch 'navarr/patch-1' into develop

# Conflicts: # environments/magento2/magento2.base.yml
wardenenv · May 21, 2020 · 80d3666 · 80d3666
2 parents d61a2b3 + f9c081c
commit 80d3666
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/environments/includes/blackfire.base.yml b/environments/includes/blackfire.base.yml
@@ -17,6 +17,7 @@ services:
       - TRAEFIK_SUBDOMAIN
       - SSH_AUTH_SOCK=/tmp/ssh-auth.sock
       - NODE_VERSION=${NODE_VERSION:-10}
+      - COMPOSER_MEMORY_LIMIT=-1
     volumes: *volumes
     extra_hosts: *extra_hosts
     depends_on:

diff --git a/environments/includes/php-fpm.base.yml b/environments/includes/php-fpm.base.yml
@@ -17,6 +17,7 @@ services:
       - TRAEFIK_SUBDOMAIN
       - SSH_AUTH_SOCK=/tmp/ssh-auth.sock
       - NODE_VERSION=${NODE_VERSION:-10}
+      - COMPOSER_MEMORY_LIMIT=-1
     volumes: *volumes
     extra_hosts: *extra_hosts
 
@@ -28,6 +29,7 @@ services:
       - TRAEFIK_SUBDOMAIN
       - SSH_AUTH_SOCK=/tmp/ssh-auth.sock
       - NODE_VERSION=${NODE_VERSION:-10}
+      - COMPOSER_MEMORY_LIMIT=-1
       - PHP_IDE_CONFIG=serverName=${WARDEN_ENV_NAME}-docker
     volumes: *volumes
     extra_hosts: *extra_hosts