From 385cf7aa9113a3a19ca6168b22a89535d797ef5f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9doine=20Sereir?= Date: Sun, 1 Nov 2020 16:27:21 +0100 Subject: [PATCH 1/2] Upgrade composer v1 to composer v2 for php 7.4 --- php/7.4/Dockerfile | 2 +- php/7.4/alpine/Dockerfile | 2 +- php/7.4/alpine/Dockerfile-lts | 2 +- php/7.4/fpm/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/php/7.4/Dockerfile b/php/7.4/Dockerfile index 26bcd970..8669e6e1 100644 --- a/php/7.4/Dockerfile +++ b/php/7.4/Dockerfile @@ -26,7 +26,7 @@ USER root WORKDIR /tmp # COPY INSTALL SCRIPTS -COPY --from=composer:1 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer COPY ./php/scripts/*.sh /tmp/ RUN chmod +x /tmp/*.sh diff --git a/php/7.4/alpine/Dockerfile b/php/7.4/alpine/Dockerfile index 421ba61d..84bf3dae 100644 --- a/php/7.4/alpine/Dockerfile +++ b/php/7.4/alpine/Dockerfile @@ -27,7 +27,7 @@ ENV PHP_VERSION=7.4 WORKDIR /tmp COPY ./php/scripts/alpine/*.sh /tmp/ -COPY --from=composer:1 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer COPY --from=mhart/alpine-node:12 /usr/bin/node /usr/bin/ COPY --from=mhart/alpine-node:12 /usr/lib/libgcc* /usr/lib/libstdc* /usr/lib/* /usr/lib/ diff --git a/php/7.4/alpine/Dockerfile-lts b/php/7.4/alpine/Dockerfile-lts index 37a727a9..52f3eeed 100644 --- a/php/7.4/alpine/Dockerfile-lts +++ b/php/7.4/alpine/Dockerfile-lts @@ -28,7 +28,7 @@ WORKDIR /tmp # COPY INSTALL SCRIPTS COPY ./php/scripts/alpine/*.sh /tmp/ -COPY --from=composer:1 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer COPY --from=mhart/alpine-node:12.16.1 /usr/bin/node /usr/bin/ COPY --from=mhart/alpine-node:12.16.1 /usr/lib/libgcc* /usr/lib/libstdc* /usr/lib/* /usr/lib/ diff --git a/php/7.4/fpm/Dockerfile b/php/7.4/fpm/Dockerfile index e054fe80..5ec71a3b 100644 --- a/php/7.4/fpm/Dockerfile +++ b/php/7.4/fpm/Dockerfile @@ -26,7 +26,7 @@ USER root WORKDIR /tmp # COPY INSTALL SCRIPTS -COPY --from=composer:1 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer COPY ./php/scripts/*.sh /tmp/ RUN chmod +x /tmp/*.sh From 56aedd0dd7b72a961860acda47beb6a87a337b85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?R=C3=A9doine=20Sereir?= Date: Tue, 3 Nov 2020 08:47:54 +0100 Subject: [PATCH 2/2] Remove hirak/prestissimo image from php with composer v2 --- .idea/.gitignore | 2 ++ php/7.4/Dockerfile | 1 - php/7.4/alpine/Dockerfile | 1 - php/7.4/alpine/Dockerfile-lts | 1 - php/7.4/fpm/Dockerfile | 1 - 5 files changed, 2 insertions(+), 4 deletions(-) create mode 100644 .idea/.gitignore diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 00000000..e7e9d11d --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,2 @@ +# Default ignored files +/workspace.xml diff --git a/php/7.4/Dockerfile b/php/7.4/Dockerfile index 8669e6e1..3a9566ef 100644 --- a/php/7.4/Dockerfile +++ b/php/7.4/Dockerfile @@ -39,7 +39,6 @@ RUN bash ./packages.sh \ echo "PATH=$(yarn global bin):$PATH" >> /root/.bashrc && \ echo "$IMAGE_USER ALL = ( ALL ) NOPASSWD: ALL" >> /etc/sudoers && \ mkdir -p /var/www/html \ - && composer global require "hirak/prestissimo:^0.3" \ && rm -rf ~/.composer/cache/* \ && chown -R $IMAGE_USER:$IMAGE_USER /var/www $HOME \ && curl -fsSL https://goss.rocks/install | GOSS_VER=v${GOSS_VERSION} sh \ diff --git a/php/7.4/alpine/Dockerfile b/php/7.4/alpine/Dockerfile index 84bf3dae..2fb777f1 100644 --- a/php/7.4/alpine/Dockerfile +++ b/php/7.4/alpine/Dockerfile @@ -39,7 +39,6 @@ RUN chmod +x /tmp/*.sh \ && bash ./packages.sh \ && bash ./extensions.sh \ && bash ./nodeyarn.sh \ - && composer global require "hirak/prestissimo:^0.3" \ && rm -rf ~/.composer/cache/* \ && chown -R $IMAGE_USER:$IMAGE_USER /var/www $HOME \ && echo "$IMAGE_USER ALL = ( ALL ) NOPASSWD: ALL" >> /etc/sudoers \ diff --git a/php/7.4/alpine/Dockerfile-lts b/php/7.4/alpine/Dockerfile-lts index 52f3eeed..bd36d8af 100644 --- a/php/7.4/alpine/Dockerfile-lts +++ b/php/7.4/alpine/Dockerfile-lts @@ -39,7 +39,6 @@ RUN chmod +x /tmp/*.sh \ && bash ./packages.sh \ && bash ./extensions.sh \ && bash ./nodeyarn.sh \ - && composer global require "hirak/prestissimo:^0.3" \ && rm -rf ~/.composer/cache/* \ && chown -R $IMAGE_USER:$IMAGE_USER /var/www $HOME \ && echo "$IMAGE_USER ALL = ( ALL ) NOPASSWD: ALL" >> /etc/sudoers \ diff --git a/php/7.4/fpm/Dockerfile b/php/7.4/fpm/Dockerfile index 5ec71a3b..cd6c32d3 100644 --- a/php/7.4/fpm/Dockerfile +++ b/php/7.4/fpm/Dockerfile @@ -38,7 +38,6 @@ RUN bash ./packages.sh \ echo "$IMAGE_USER ALL = ( ALL ) NOPASSWD: ALL" >> /etc/sudoers && \ mkdir -p /var/www/html && \ chown -R $IMAGE_USER:$IMAGE_USER /var/www $HOME \ - && composer global require "hirak/prestissimo:^0.3" \ && rm -rf ~/.composer/cache/* \ && chown -R $IMAGE_USER:$IMAGE_USER $COMPOSER_HOME \ && curl -fsSL https://goss.rocks/install | GOSS_VER=v${GOSS_VERSION} sh \