Skip to content

Commit

Permalink
Release/8.0 - upgrade composer to 1.10.27 and 2.7.1 (#341)
Browse files Browse the repository at this point in the history
  • Loading branch information
niepi committed Feb 12, 2024
1 parent d65f702 commit 61fbb8b
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 12 deletions.
9 changes: 3 additions & 6 deletions 8.0/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -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.26 /usr/bin/composer /usr/local/bin/composer1
COPY --from=composer:2.5.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 \
Expand Down
9 changes: 3 additions & 6 deletions 8.0/Dockerfile-alpine
Original file line number Diff line number Diff line change
Expand Up @@ -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.26 /usr/bin/composer /usr/local/bin/composer1
COPY --from=composer:2.5.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 \
Expand Down

0 comments on commit 61fbb8b

Please sign in to comment.