diff --git a/Dockerfiles/work/Dockerfile-7.2 b/Dockerfiles/work/Dockerfile-7.2 index 5ba6272..b295fa4 100644 --- a/Dockerfiles/work/Dockerfile-7.2 +++ b/Dockerfiles/work/Dockerfile-7.2 @@ -156,7 +156,6 @@ RUN set -eux \ # -------------------- composer -------------------- && COMPOSER_1_VERSION="latest-1.x" \ && COMPOSER_2_VERSION="latest-2.x" \ -&& COMPOSER_2_VERSION="" \ \ && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \ && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \ diff --git a/Dockerfiles/work/Dockerfile-7.3 b/Dockerfiles/work/Dockerfile-7.3 index 5c6c10d..43abd93 100644 --- a/Dockerfiles/work/Dockerfile-7.3 +++ b/Dockerfiles/work/Dockerfile-7.3 @@ -156,7 +156,6 @@ RUN set -eux \ # -------------------- composer -------------------- && COMPOSER_1_VERSION="latest-1.x" \ && COMPOSER_2_VERSION="latest-2.x" \ -&& COMPOSER_2_VERSION="" \ \ && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \ && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \ diff --git a/Dockerfiles/work/Dockerfile-7.4 b/Dockerfiles/work/Dockerfile-7.4 index 8ef5153..eea1c57 100644 --- a/Dockerfiles/work/Dockerfile-7.4 +++ b/Dockerfiles/work/Dockerfile-7.4 @@ -156,7 +156,6 @@ RUN set -eux \ # -------------------- composer -------------------- && COMPOSER_1_VERSION="latest-1.x" \ && COMPOSER_2_VERSION="latest-2.x" \ -&& COMPOSER_2_VERSION="" \ \ && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \ && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \ diff --git a/Dockerfiles/work/Dockerfile-8.0 b/Dockerfiles/work/Dockerfile-8.0 index 3f04450..1f69a33 100644 --- a/Dockerfiles/work/Dockerfile-8.0 +++ b/Dockerfiles/work/Dockerfile-8.0 @@ -156,7 +156,6 @@ RUN set -eux \ # -------------------- composer -------------------- && COMPOSER_1_VERSION="latest-1.x" \ && COMPOSER_2_VERSION="latest-2.x" \ -&& COMPOSER_2_VERSION="" \ \ && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \ && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \ diff --git a/Dockerfiles/work/Dockerfile-8.1 b/Dockerfiles/work/Dockerfile-8.1 index c2d8372..e50af33 100644 --- a/Dockerfiles/work/Dockerfile-8.1 +++ b/Dockerfiles/work/Dockerfile-8.1 @@ -156,7 +156,6 @@ RUN set -eux \ # -------------------- composer -------------------- && COMPOSER_1_VERSION="latest-1.x" \ && COMPOSER_2_VERSION="latest-2.x" \ -&& COMPOSER_2_VERSION="" \ \ && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \ && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \ diff --git a/Dockerfiles/work/Dockerfile-8.2 b/Dockerfiles/work/Dockerfile-8.2 index 4307420..ec6e03e 100644 --- a/Dockerfiles/work/Dockerfile-8.2 +++ b/Dockerfiles/work/Dockerfile-8.2 @@ -156,7 +156,6 @@ RUN set -eux \ # -------------------- composer -------------------- && COMPOSER_1_VERSION="latest-1.x" \ && COMPOSER_2_VERSION="latest-2.x" \ -&& COMPOSER_2_VERSION="" \ \ && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \ && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \ diff --git a/build/ansible/group_vars/all/work.yml b/build/ansible/group_vars/all/work.yml index e823031..d7e4ad3 100644 --- a/build/ansible/group_vars/all/work.yml +++ b/build/ansible/group_vars/all/work.yml @@ -463,7 +463,6 @@ software_available: pre: | COMPOSER_1_VERSION="latest-1.x" \ && COMPOSER_2_VERSION="latest-2.x" \ - && COMPOSER_2_VERSION="" \ command: | curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \ && curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \