From e1d0326b58ddae1cb9136f651c1b35e58c904830 Mon Sep 17 00:00:00 2001 From: Thomas Niepraschk Date: Mon, 12 Feb 2024 10:44:19 +0100 Subject: [PATCH 1/2] upgrade composer to 1.10.27 and 2.7.1 --- 8.0/Dockerfile | 4 ++-- 8.0/Dockerfile-alpine | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/8.0/Dockerfile b/8.0/Dockerfile index 1cfe040..b179197 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -68,8 +68,8 @@ RUN echo "zend_extension=`php -i | grep ^extension_dir | cut -f 3 -d ' '`/xdebug RUN docker-php-ext-install soap ENV COMPOSER_HOME=/composer -COPY --from=composer:1.10.26 /usr/bin/composer /usr/local/bin/composer1 -COPY --from=composer:2.5.1 /usr/bin/composer /usr/local/bin/composer2 +COPY --from=composer:1.10.27 /usr/bin/composer /usr/local/bin/composer1 +COPY --from=composer:2.7.1 /usr/bin/composer /usr/local/bin/composer2 COPY composer /usr/local/bin/composer RUN chmod +x /usr/local/bin/composer diff --git a/8.0/Dockerfile-alpine b/8.0/Dockerfile-alpine index 6682ceb..93158f4 100644 --- a/8.0/Dockerfile-alpine +++ b/8.0/Dockerfile-alpine @@ -124,8 +124,8 @@ FROM base ENV COMPOSER_HOME=/composer -COPY --from=composer:1.10.26 /usr/bin/composer /usr/local/bin/composer1 -COPY --from=composer:2.5.1 /usr/bin/composer /usr/local/bin/composer2 +COPY --from=composer:1.10.27 /usr/bin/composer /usr/local/bin/composer1 +COPY --from=composer:2.7.1 /usr/bin/composer /usr/local/bin/composer2 COPY composer /usr/local/bin RUN chmod +x /usr/local/bin/composer From 0be300bd217a7950822c18e736813752258340d8 Mon Sep 17 00:00:00 2001 From: Thomas Niepraschk Date: Mon, 12 Feb 2024 16:30:21 +0100 Subject: [PATCH 2/2] pull composer directly from github release page --- 8.0/Dockerfile | 9 +++------ 8.0/Dockerfile-alpine | 9 +++------ 2 files changed, 6 insertions(+), 12 deletions(-) diff --git a/8.0/Dockerfile b/8.0/Dockerfile index b179197..f8eaa15 100644 --- a/8.0/Dockerfile +++ b/8.0/Dockerfile @@ -68,12 +68,9 @@ RUN echo "zend_extension=`php -i | grep ^extension_dir | cut -f 3 -d ' '`/xdebug RUN docker-php-ext-install soap ENV COMPOSER_HOME=/composer -COPY --from=composer:1.10.27 /usr/bin/composer /usr/local/bin/composer1 -COPY --from=composer:2.7.1 /usr/bin/composer /usr/local/bin/composer2 - -COPY composer /usr/local/bin/composer -RUN chmod +x /usr/local/bin/composer - +RUN curl -L https://github.com/composer/composer/releases/download/1.10.27/composer.phar > /usr/local/bin/composer1 && chmod +x /usr/local/bin/composer1 +RUN curl -L https://github.com/composer/composer/releases/download/2.7.1/composer.phar > /usr/local/bin/composer2 && chmod +x /usr/local/bin/composer2 +ADD composer /usr/local/bin/composer RUN apt-get update && apt-get install --no-install-recommends -y \ git git-lfs vim default-mysql-client rsync sshpass openssh-client bzip2 msmtp unzip \ diff --git a/8.0/Dockerfile-alpine b/8.0/Dockerfile-alpine index 93158f4..cf8d9dc 100644 --- a/8.0/Dockerfile-alpine +++ b/8.0/Dockerfile-alpine @@ -123,12 +123,9 @@ RUN cp `php -i | grep ^extension_dir | cut -f 3 -d ' '`/*.so /tmp/ FROM base ENV COMPOSER_HOME=/composer - -COPY --from=composer:1.10.27 /usr/bin/composer /usr/local/bin/composer1 -COPY --from=composer:2.7.1 /usr/bin/composer /usr/local/bin/composer2 - -COPY composer /usr/local/bin -RUN chmod +x /usr/local/bin/composer +RUN curl -L https://github.com/composer/composer/releases/download/1.10.27/composer.phar > /usr/local/bin/composer1 && chmod +x /usr/local/bin/composer1 +RUN curl -L https://github.com/composer/composer/releases/download/2.7.1/composer.phar > /usr/local/bin/composer2 && chmod +x /usr/local/bin/composer2 +ADD composer /usr/local/bin/composer RUN apk add --no-cache \ git \