Fix composer install

cytopia · cytopia · commit b9efb7b1c371 · 2022-03-31T15:08:04.000+02:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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 \

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,6 @@ RUN set -eux \`
`156`	`156`	`# -------------------- composer --------------------`
`157`	`157`	`&& COMPOSER_1_VERSION="latest-1.x" \`
`158`	`158`	`&& COMPOSER_2_VERSION="latest-2.x" \`
`159`		`-&& COMPOSER_2_VERSION="" \`
`160`	`159`	`\`
`161`	`160`	`&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \`
`162`	`161`	`&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \`