From b25ca9c66b29d29b7ca414d2b33ad280745262f4 Mon Sep 17 00:00:00 2001 From: Mohanarengan Date: Wed, 15 Apr 2020 13:52:14 +0530 Subject: [PATCH 1/3] Fix for composer running out of memory in container --- images/php/7.1-cli/etc/php-cli.ini | 1 + images/php/7.2-cli/etc/php-cli.ini | 1 + images/php/7.3-cli/etc/php-cli.ini | 2 ++ images/php/cli/etc/php-cli.ini | 1 + 4 files changed, 5 insertions(+) diff --git a/images/php/7.1-cli/etc/php-cli.ini b/images/php/7.1-cli/etc/php-cli.ini index 20a14935..6a3a35dc 100644 --- a/images/php/7.1-cli/etc/php-cli.ini +++ b/images/php/7.1-cli/etc/php-cli.ini @@ -7,3 +7,4 @@ always_populate_raw_post_data = -1 max_input_vars = 10000 session.gc_probability = 1 opcache.enable = 1 +composer_memory_limit = -1 diff --git a/images/php/7.2-cli/etc/php-cli.ini b/images/php/7.2-cli/etc/php-cli.ini index 20a14935..6a3a35dc 100644 --- a/images/php/7.2-cli/etc/php-cli.ini +++ b/images/php/7.2-cli/etc/php-cli.ini @@ -7,3 +7,4 @@ always_populate_raw_post_data = -1 max_input_vars = 10000 session.gc_probability = 1 opcache.enable = 1 +composer_memory_limit = -1 diff --git a/images/php/7.3-cli/etc/php-cli.ini b/images/php/7.3-cli/etc/php-cli.ini index 20a14935..72895dde 100644 --- a/images/php/7.3-cli/etc/php-cli.ini +++ b/images/php/7.3-cli/etc/php-cli.ini @@ -7,3 +7,5 @@ always_populate_raw_post_data = -1 max_input_vars = 10000 session.gc_probability = 1 opcache.enable = 1 +composer_memory_limit = -1 + diff --git a/images/php/cli/etc/php-cli.ini b/images/php/cli/etc/php-cli.ini index 20a14935..6a3a35dc 100755 --- a/images/php/cli/etc/php-cli.ini +++ b/images/php/cli/etc/php-cli.ini @@ -7,3 +7,4 @@ always_populate_raw_post_data = -1 max_input_vars = 10000 session.gc_probability = 1 opcache.enable = 1 +composer_memory_limit = -1 From 1a808cffcf95cee2bcf6c6ff1070e9b220bab6e1 Mon Sep 17 00:00:00 2001 From: Mohanarengan Date: Fri, 17 Apr 2020 14:24:03 +0530 Subject: [PATCH 2/3] Fix for composer running out of memory in container --- images/php/7.1-cli/Dockerfile | 1 + images/php/7.1-cli/etc/php-cli.ini | 2 +- images/php/7.2-cli/Dockerfile | 1 + images/php/7.2-cli/etc/php-cli.ini | 2 +- images/php/7.3-cli/Dockerfile | 1 + images/php/7.3-cli/etc/php-cli.ini | 3 +-- images/php/cli/Dockerfile | 1 + images/php/cli/etc/php-cli.ini | 2 +- 8 files changed, 8 insertions(+), 5 deletions(-) diff --git a/images/php/7.1-cli/Dockerfile b/images/php/7.1-cli/Dockerfile index d409058d..1dec9822 100644 --- a/images/php/7.1-cli/Dockerfile +++ b/images/php/7.1-cli/Dockerfile @@ -2,6 +2,7 @@ FROM php:7.1-cli-stretch ARG GOSU_VERSION=1.11 +ENV COMPOSER_MEMORY_LIMIT -1 ENV PHP_MEMORY_LIMIT 2G ENV MAGENTO_ROOT /app ENV DEBUG false diff --git a/images/php/7.1-cli/etc/php-cli.ini b/images/php/7.1-cli/etc/php-cli.ini index 6a3a35dc..9e62cc96 100644 --- a/images/php/7.1-cli/etc/php-cli.ini +++ b/images/php/7.1-cli/etc/php-cli.ini @@ -7,4 +7,4 @@ always_populate_raw_post_data = -1 max_input_vars = 10000 session.gc_probability = 1 opcache.enable = 1 -composer_memory_limit = -1 +composer_memory_limit = COMPOSER_MEMORY_LIMIT diff --git a/images/php/7.2-cli/Dockerfile b/images/php/7.2-cli/Dockerfile index 53d26290..a4bcaad5 100644 --- a/images/php/7.2-cli/Dockerfile +++ b/images/php/7.2-cli/Dockerfile @@ -2,6 +2,7 @@ FROM php:7.2-cli-stretch ARG GOSU_VERSION=1.11 +ENV COMPOSER_MEMORY_LIMIT -1 ENV PHP_MEMORY_LIMIT 2G ENV MAGENTO_ROOT /app ENV DEBUG false diff --git a/images/php/7.2-cli/etc/php-cli.ini b/images/php/7.2-cli/etc/php-cli.ini index 6a3a35dc..9e62cc96 100644 --- a/images/php/7.2-cli/etc/php-cli.ini +++ b/images/php/7.2-cli/etc/php-cli.ini @@ -7,4 +7,4 @@ always_populate_raw_post_data = -1 max_input_vars = 10000 session.gc_probability = 1 opcache.enable = 1 -composer_memory_limit = -1 +composer_memory_limit = COMPOSER_MEMORY_LIMIT diff --git a/images/php/7.3-cli/Dockerfile b/images/php/7.3-cli/Dockerfile index 846d0177..ed3521f6 100644 --- a/images/php/7.3-cli/Dockerfile +++ b/images/php/7.3-cli/Dockerfile @@ -2,6 +2,7 @@ FROM php:7.3-cli-stretch ARG GOSU_VERSION=1.11 +ENV COMPOSER_MEMORY_LIMIT -1 ENV PHP_MEMORY_LIMIT 2G ENV MAGENTO_ROOT /app ENV DEBUG false diff --git a/images/php/7.3-cli/etc/php-cli.ini b/images/php/7.3-cli/etc/php-cli.ini index 72895dde..9e62cc96 100644 --- a/images/php/7.3-cli/etc/php-cli.ini +++ b/images/php/7.3-cli/etc/php-cli.ini @@ -7,5 +7,4 @@ always_populate_raw_post_data = -1 max_input_vars = 10000 session.gc_probability = 1 opcache.enable = 1 -composer_memory_limit = -1 - +composer_memory_limit = COMPOSER_MEMORY_LIMIT diff --git a/images/php/cli/Dockerfile b/images/php/cli/Dockerfile index 71f4a5b3..c938eb2d 100755 --- a/images/php/cli/Dockerfile +++ b/images/php/cli/Dockerfile @@ -2,6 +2,7 @@ FROM php:{%version%}-cli-stretch ARG GOSU_VERSION=1.11 +ENV COMPOSER_MEMORY_LIMIT -1 ENV PHP_MEMORY_LIMIT 2G ENV MAGENTO_ROOT /app ENV DEBUG false diff --git a/images/php/cli/etc/php-cli.ini b/images/php/cli/etc/php-cli.ini index 6a3a35dc..9e62cc96 100755 --- a/images/php/cli/etc/php-cli.ini +++ b/images/php/cli/etc/php-cli.ini @@ -7,4 +7,4 @@ always_populate_raw_post_data = -1 max_input_vars = 10000 session.gc_probability = 1 opcache.enable = 1 -composer_memory_limit = -1 +composer_memory_limit = COMPOSER_MEMORY_LIMIT From c4b5d1e7813338a433f95f1f02917e70c421f399 Mon Sep 17 00:00:00 2001 From: Mohanarengan Date: Thu, 23 Apr 2020 23:20:01 +0530 Subject: [PATCH 3/3] Fix for composer running out of memory --- images/php/7.1-cli/etc/php-cli.ini | 1 - images/php/7.2-cli/etc/php-cli.ini | 1 - images/php/7.3-cli/etc/php-cli.ini | 1 - images/php/cli/etc/php-cli.ini | 1 - 4 files changed, 4 deletions(-) diff --git a/images/php/7.1-cli/etc/php-cli.ini b/images/php/7.1-cli/etc/php-cli.ini index 9e62cc96..20a14935 100644 --- a/images/php/7.1-cli/etc/php-cli.ini +++ b/images/php/7.1-cli/etc/php-cli.ini @@ -7,4 +7,3 @@ always_populate_raw_post_data = -1 max_input_vars = 10000 session.gc_probability = 1 opcache.enable = 1 -composer_memory_limit = COMPOSER_MEMORY_LIMIT diff --git a/images/php/7.2-cli/etc/php-cli.ini b/images/php/7.2-cli/etc/php-cli.ini index 9e62cc96..20a14935 100644 --- a/images/php/7.2-cli/etc/php-cli.ini +++ b/images/php/7.2-cli/etc/php-cli.ini @@ -7,4 +7,3 @@ always_populate_raw_post_data = -1 max_input_vars = 10000 session.gc_probability = 1 opcache.enable = 1 -composer_memory_limit = COMPOSER_MEMORY_LIMIT diff --git a/images/php/7.3-cli/etc/php-cli.ini b/images/php/7.3-cli/etc/php-cli.ini index 9e62cc96..20a14935 100644 --- a/images/php/7.3-cli/etc/php-cli.ini +++ b/images/php/7.3-cli/etc/php-cli.ini @@ -7,4 +7,3 @@ always_populate_raw_post_data = -1 max_input_vars = 10000 session.gc_probability = 1 opcache.enable = 1 -composer_memory_limit = COMPOSER_MEMORY_LIMIT diff --git a/images/php/cli/etc/php-cli.ini b/images/php/cli/etc/php-cli.ini index 9e62cc96..20a14935 100755 --- a/images/php/cli/etc/php-cli.ini +++ b/images/php/cli/etc/php-cli.ini @@ -7,4 +7,3 @@ always_populate_raw_post_data = -1 max_input_vars = 10000 session.gc_probability = 1 opcache.enable = 1 -composer_memory_limit = COMPOSER_MEMORY_LIMIT