From 77e1f26715f38104ead1232a3e0d5bfffe425cd2 Mon Sep 17 00:00:00 2001 From: Matias Orlando Date: Fri, 2 Jul 2021 08:57:37 +0700 Subject: [PATCH 1/3] Composer 2 for Oro 4.2 Set composer version to 2 --- environments/native/php@7.4/cli/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/native/php@7.4/cli/Dockerfile b/environments/native/php@7.4/cli/Dockerfile index 44078d8..4b2c3d3 100644 --- a/environments/native/php@7.4/cli/Dockerfile +++ b/environments/native/php@7.4/cli/Dockerfile @@ -55,7 +55,7 @@ RUN set -ex \ && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ && ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" \ && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then >&2 echo 'ERROR: Invalid installer signature'; rm composer-setup.php; exit 1; fi \ - && php composer-setup.php --install-dir /usr/local/bin --filename composer --1 \ + && php composer-setup.php --install-dir /usr/local/bin --filename composer --2 \ && php -r "unlink('composer-setup.php');" \ && mkdir -p /opt/${APP_USERNAME}/.npm \ && mkdir -p /opt/${APP_USERNAME}/.composer \ From c3b8d972691038a1ea9f9b4303bf30dc23837349 Mon Sep 17 00:00:00 2001 From: Matias Orlando Date: Mon, 5 Jul 2021 16:06:05 +0700 Subject: [PATCH 2/3] Added Composer 2 to PHP 7.4 for OroCRM 4.2 --- environments/orocrm/ce/4.2/php@7.4/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/environments/orocrm/ce/4.2/php@7.4/Dockerfile b/environments/orocrm/ce/4.2/php@7.4/Dockerfile index c158684..67e1456 100644 --- a/environments/orocrm/ce/4.2/php@7.4/Dockerfile +++ b/environments/orocrm/ce/4.2/php@7.4/Dockerfile @@ -30,4 +30,10 @@ RUN set -ex\ && docker-php-ext-install tidy \ && docker-php-ext-configure ldap --with-ldap \ && docker-php-ext-install ldap \ + && EXPECTED_SIGNATURE="$(wget -q -O - https://composer.github.io/installer.sig)" \ + && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ + && ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" \ + && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then >&2 echo 'ERROR: Invalid installer signature'; rm composer-setup.php; exit 1; fi \ + && php composer-setup.php --install-dir /usr/local/bin --filename composer --2 \ + && php -r "unlink('composer-setup.php');" && rm -rf /tmp/* /var/cache/apk/* From c9a0d6bb34005b58a713a4311ccc86f3ca91d887 Mon Sep 17 00:00:00 2001 From: Matias Orlando Date: Mon, 5 Jul 2021 16:07:04 +0700 Subject: [PATCH 3/3] Remove composer 2 on the native PHP image --- environments/native/php@7.4/cli/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/native/php@7.4/cli/Dockerfile b/environments/native/php@7.4/cli/Dockerfile index 4b2c3d3..44078d8 100644 --- a/environments/native/php@7.4/cli/Dockerfile +++ b/environments/native/php@7.4/cli/Dockerfile @@ -55,7 +55,7 @@ RUN set -ex \ && php -r "copy('https://getcomposer.org/installer', 'composer-setup.php');" \ && ACTUAL_SIGNATURE="$(php -r "echo hash_file('sha384', 'composer-setup.php');")" \ && if [ "$EXPECTED_SIGNATURE" != "$ACTUAL_SIGNATURE" ]; then >&2 echo 'ERROR: Invalid installer signature'; rm composer-setup.php; exit 1; fi \ - && php composer-setup.php --install-dir /usr/local/bin --filename composer --2 \ + && php composer-setup.php --install-dir /usr/local/bin --filename composer --1 \ && php -r "unlink('composer-setup.php');" \ && mkdir -p /opt/${APP_USERNAME}/.npm \ && mkdir -p /opt/${APP_USERNAME}/.composer \