From 1070061fe5a0645eaf5e3e33b9f62f12c81a6afc Mon Sep 17 00:00:00 2001 From: Jakub Zalas Date: Sun, 12 Jul 2020 21:42:51 +0100 Subject: [PATCH] Switch to composer 2 --- 7.2/alpine/Dockerfile | 2 +- 7.2/debian/Dockerfile | 2 +- 7.3/alpine/Dockerfile | 2 +- 7.3/debian/Dockerfile | 2 +- 7.4/alpine/Dockerfile | 2 +- 7.4/debian/Dockerfile | 2 +- Dockerfile-alpine | 2 +- Dockerfile-debian | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/7.2/alpine/Dockerfile b/7.2/alpine/Dockerfile index e3bb7d4a..8cad2f28 100644 --- a/7.2/alpine/Dockerfile +++ b/7.2/alpine/Dockerfile @@ -12,7 +12,7 @@ ENV PATH="$PATH:$TOOLBOX_TARGET_DIR:$TOOLBOX_TARGET_DIR/.composer/vendor/bin:$TO ENV COMPOSER_ALLOW_SUPERUSER 1 ENV COMPOSER_HOME=$TOOLBOX_TARGET_DIR/.composer -COPY --from=composer:1.10 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer RUN apk add --no-cache --virtual .tool-deps $TOOL_DEPS $LIB_DEPS \ && apk add --no-cache --virtual .build-deps $BUILD_DEPS \ diff --git a/7.2/debian/Dockerfile b/7.2/debian/Dockerfile index 932da36f..a8bd251d 100644 --- a/7.2/debian/Dockerfile +++ b/7.2/debian/Dockerfile @@ -12,7 +12,7 @@ ENV PATH="$PATH:$TOOLBOX_TARGET_DIR:$TOOLBOX_TARGET_DIR/.composer/vendor/bin:/to ENV COMPOSER_ALLOW_SUPERUSER 1 ENV COMPOSER_HOME=$TOOLBOX_TARGET_DIR/.composer -COPY --from=composer:1.10 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer RUN apt-get update && apt-get install -y --no-install-recommends $TOOL_DEPS $BUILD_DEPS $LIB_DEPS && rm -rf /var/lib/apt/lists/* \ && git clone https://github.com/nikic/php-ast.git && cd php-ast && phpize && ./configure && make && make install && cd .. && rm -rf php-ast && docker-php-ext-enable ast \ diff --git a/7.3/alpine/Dockerfile b/7.3/alpine/Dockerfile index 5d229768..845c7e2f 100644 --- a/7.3/alpine/Dockerfile +++ b/7.3/alpine/Dockerfile @@ -12,7 +12,7 @@ ENV PATH="$PATH:$TOOLBOX_TARGET_DIR:$TOOLBOX_TARGET_DIR/.composer/vendor/bin:$TO ENV COMPOSER_ALLOW_SUPERUSER 1 ENV COMPOSER_HOME=$TOOLBOX_TARGET_DIR/.composer -COPY --from=composer:1.10 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer RUN apk add --no-cache --virtual .tool-deps $TOOL_DEPS $LIB_DEPS \ && apk add --no-cache --virtual .build-deps $BUILD_DEPS \ diff --git a/7.3/debian/Dockerfile b/7.3/debian/Dockerfile index c5876d20..d7d2f439 100644 --- a/7.3/debian/Dockerfile +++ b/7.3/debian/Dockerfile @@ -12,7 +12,7 @@ ENV PATH="$PATH:$TOOLBOX_TARGET_DIR:$TOOLBOX_TARGET_DIR/.composer/vendor/bin:/to ENV COMPOSER_ALLOW_SUPERUSER 1 ENV COMPOSER_HOME=$TOOLBOX_TARGET_DIR/.composer -COPY --from=composer:1.10 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer RUN apt-get update && apt-get install -y --no-install-recommends $TOOL_DEPS $BUILD_DEPS $LIB_DEPS && rm -rf /var/lib/apt/lists/* \ && git clone https://github.com/nikic/php-ast.git && cd php-ast && phpize && ./configure && make && make install && cd .. && rm -rf php-ast && docker-php-ext-enable ast \ diff --git a/7.4/alpine/Dockerfile b/7.4/alpine/Dockerfile index e9e42af6..0e5b2c56 100644 --- a/7.4/alpine/Dockerfile +++ b/7.4/alpine/Dockerfile @@ -12,7 +12,7 @@ ENV PATH="$PATH:$TOOLBOX_TARGET_DIR:$TOOLBOX_TARGET_DIR/.composer/vendor/bin:$TO ENV COMPOSER_ALLOW_SUPERUSER 1 ENV COMPOSER_HOME=$TOOLBOX_TARGET_DIR/.composer -COPY --from=composer:1.10 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer RUN apk add --no-cache --virtual .tool-deps $TOOL_DEPS $LIB_DEPS \ && apk add --no-cache --virtual .build-deps $BUILD_DEPS \ diff --git a/7.4/debian/Dockerfile b/7.4/debian/Dockerfile index 97333b81..6875e12f 100644 --- a/7.4/debian/Dockerfile +++ b/7.4/debian/Dockerfile @@ -12,7 +12,7 @@ ENV PATH="$PATH:$TOOLBOX_TARGET_DIR:$TOOLBOX_TARGET_DIR/.composer/vendor/bin:/to ENV COMPOSER_ALLOW_SUPERUSER 1 ENV COMPOSER_HOME=$TOOLBOX_TARGET_DIR/.composer -COPY --from=composer:1.10 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer RUN apt-get update && apt-get install -y --no-install-recommends $TOOL_DEPS $BUILD_DEPS $LIB_DEPS && rm -rf /var/lib/apt/lists/* \ && git clone https://github.com/nikic/php-ast.git && cd php-ast && phpize && ./configure && make && make install && cd .. && rm -rf php-ast && docker-php-ext-enable ast \ diff --git a/Dockerfile-alpine b/Dockerfile-alpine index 286f2894..9c813651 100644 --- a/Dockerfile-alpine +++ b/Dockerfile-alpine @@ -12,7 +12,7 @@ ENV PATH="$PATH:$TOOLBOX_TARGET_DIR:$TOOLBOX_TARGET_DIR/.composer/vendor/bin:$TO ENV COMPOSER_ALLOW_SUPERUSER 1 ENV COMPOSER_HOME=$TOOLBOX_TARGET_DIR/.composer -COPY --from=composer:1.10 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer RUN apk add --no-cache --virtual .tool-deps $TOOL_DEPS $LIB_DEPS \ && apk add --no-cache --virtual .build-deps $BUILD_DEPS \ diff --git a/Dockerfile-debian b/Dockerfile-debian index a344c661..2bce6019 100644 --- a/Dockerfile-debian +++ b/Dockerfile-debian @@ -12,7 +12,7 @@ ENV PATH="$PATH:$TOOLBOX_TARGET_DIR:$TOOLBOX_TARGET_DIR/.composer/vendor/bin:/to ENV COMPOSER_ALLOW_SUPERUSER 1 ENV COMPOSER_HOME=$TOOLBOX_TARGET_DIR/.composer -COPY --from=composer:1.10 /usr/bin/composer /usr/bin/composer +COPY --from=composer:2 /usr/bin/composer /usr/bin/composer RUN apt-get update && apt-get install -y --no-install-recommends $TOOL_DEPS $BUILD_DEPS $LIB_DEPS && rm -rf /var/lib/apt/lists/* \ && git clone https://github.com/nikic/php-ast.git && cd php-ast && phpize && ./configure && make && make install && cd .. && rm -rf php-ast && docker-php-ext-enable ast \