Skip to content

Commit 2471921

Browse files
cytopiacytopia
committed
Fix composer install
1 parent fd44d5a commit 2471921

File tree

15 files changed

+179
-68
lines changed

15 files changed

+179
-68
lines changed

‎Dockerfiles/work/Dockerfile-5.2

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -477,10 +477,13 @@ RUN set -eux \
477477
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
478478
\
479479
\
480-
&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
481480
\
482-
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
483-
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
481+
&& if [ -f "/opt/nvm/nvm.sh" ]; then \
482+
ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
483+
\
484+
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
485+
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
486+
fi \
484487
\
485488
&& (rm -rf /home/devilbox/.*json || true) \
486489
&& (rm -rf /home/devilbox/.ansible || true) \

‎Dockerfiles/work/Dockerfile-5.3

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,11 @@ RUN set -eux \
153153
###
154154
RUN set -eux \
155155
# -------------------- composer --------------------
156-
&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
157-
&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
156+
&& COMPOSER_1_VERSION="latest-1.x" \
157+
&& COMPOSER_2_VERSION="latest-2.2.x" \
158+
\
159+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
160+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
158161
&& chmod +x /usr/local/bin/composer-1 \
159162
&& chmod +x /usr/local/bin/composer-2 \
160163
\
@@ -535,10 +538,13 @@ RUN set -eux \
535538
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
536539
\
537540
\
538-
&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
539541
\
540-
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
541-
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
542+
&& if [ -f "/opt/nvm/nvm.sh" ]; then \
543+
ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
544+
\
545+
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
546+
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
547+
fi \
542548
\
543549
&& (rm -rf /home/devilbox/.*json || true) \
544550
&& (rm -rf /home/devilbox/.ansible || true) \

‎Dockerfiles/work/Dockerfile-5.4

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,11 @@ RUN set -eux \
153153
###
154154
RUN set -eux \
155155
# -------------------- composer --------------------
156-
&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
157-
&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
156+
&& COMPOSER_1_VERSION="latest-1.x" \
157+
&& COMPOSER_2_VERSION="latest-2.2.x" \
158+
\
159+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
160+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
158161
&& chmod +x /usr/local/bin/composer-1 \
159162
&& chmod +x /usr/local/bin/composer-2 \
160163
\
@@ -573,10 +576,13 @@ RUN set -eux \
573576
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
574577
\
575578
\
576-
&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
577579
\
578-
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
579-
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
580+
&& if [ -f "/opt/nvm/nvm.sh" ]; then \
581+
ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
582+
\
583+
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
584+
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
585+
fi \
580586
\
581587
&& (rm -rf /home/devilbox/.*json || true) \
582588
&& (rm -rf /home/devilbox/.ansible || true) \

‎Dockerfiles/work/Dockerfile-5.5

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -153,8 +153,11 @@ RUN set -eux \
153153
###
154154
RUN set -eux \
155155
# -------------------- composer --------------------
156-
&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
157-
&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
156+
&& COMPOSER_1_VERSION="latest-1.x" \
157+
&& COMPOSER_2_VERSION="latest-2.2.x" \
158+
\
159+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
160+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
158161
&& chmod +x /usr/local/bin/composer-1 \
159162
&& chmod +x /usr/local/bin/composer-2 \
160163
\
@@ -587,10 +590,13 @@ RUN set -eux \
587590
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
588591
\
589592
\
590-
&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
591593
\
592-
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
593-
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
594+
&& if [ -f "/opt/nvm/nvm.sh" ]; then \
595+
ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
596+
\
597+
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
598+
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
599+
fi \
594600
\
595601
&& (rm -rf /home/devilbox/.*json || true) \
596602
&& (rm -rf /home/devilbox/.ansible || true) \

‎Dockerfiles/work/Dockerfile-5.6

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,11 @@ RUN set -eux \
155155
###
156156
RUN set -eux \
157157
# -------------------- composer --------------------
158-
&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
159-
&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
158+
&& COMPOSER_1_VERSION="latest-1.x" \
159+
&& COMPOSER_2_VERSION="latest-2.2.x" \
160+
\
161+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
162+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
160163
&& chmod +x /usr/local/bin/composer-1 \
161164
&& chmod +x /usr/local/bin/composer-2 \
162165
\
@@ -603,10 +606,13 @@ RUN set -eux \
603606
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
604607
\
605608
\
606-
&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
607609
\
608-
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
609-
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
610+
&& if [ -f "/opt/nvm/nvm.sh" ]; then \
611+
ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
612+
\
613+
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
614+
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
615+
fi \
610616
\
611617
&& (rm -rf /home/devilbox/.*json || true) \
612618
&& (rm -rf /home/devilbox/.ansible || true) \

‎Dockerfiles/work/Dockerfile-7.0

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -155,8 +155,11 @@ RUN set -eux \
155155
###
156156
RUN set -eux \
157157
# -------------------- composer --------------------
158-
&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
159-
&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
158+
&& COMPOSER_1_VERSION="latest-1.x" \
159+
&& COMPOSER_2_VERSION="latest-2.2.x" \
160+
\
161+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
162+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
160163
&& chmod +x /usr/local/bin/composer-1 \
161164
&& chmod +x /usr/local/bin/composer-2 \
162165
\
@@ -584,10 +587,13 @@ RUN set -eux \
584587
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
585588
\
586589
\
587-
&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
588590
\
589-
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
590-
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
591+
&& if [ -f "/opt/nvm/nvm.sh" ]; then \
592+
ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
593+
\
594+
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
595+
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
596+
fi \
591597
\
592598
&& (rm -rf /home/devilbox/.*json || true) \
593599
&& (rm -rf /home/devilbox/.ansible || true) \

‎Dockerfiles/work/Dockerfile-7.1

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,11 @@ RUN set -eux \
154154
###
155155
RUN set -eux \
156156
# -------------------- composer --------------------
157-
&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
158-
&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
157+
&& COMPOSER_1_VERSION="latest-1.x" \
158+
&& COMPOSER_2_VERSION="latest-2.2.x" \
159+
\
160+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
161+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
159162
&& chmod +x /usr/local/bin/composer-1 \
160163
&& chmod +x /usr/local/bin/composer-2 \
161164
\
@@ -583,10 +586,13 @@ RUN set -eux \
583586
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
584587
\
585588
\
586-
&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
587589
\
588-
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
589-
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
590+
&& if [ -f "/opt/nvm/nvm.sh" ]; then \
591+
ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
592+
\
593+
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
594+
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
595+
fi \
590596
\
591597
&& (rm -rf /home/devilbox/.*json || true) \
592598
&& (rm -rf /home/devilbox/.ansible || true) \

‎Dockerfiles/work/Dockerfile-7.2

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,12 @@ RUN set -eux \
154154
###
155155
RUN set -eux \
156156
# -------------------- composer --------------------
157-
&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
158-
&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
157+
&& COMPOSER_1_VERSION="latest-1.x" \
158+
&& COMPOSER_2_VERSION="latest-2.x" \
159+
&& COMPOSER_2_VERSION="" \
160+
\
161+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
162+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
159163
&& chmod +x /usr/local/bin/composer-1 \
160164
&& chmod +x /usr/local/bin/composer-2 \
161165
\
@@ -603,10 +607,13 @@ RUN set -eux \
603607
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
604608
\
605609
\
606-
&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
607610
\
608-
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
609-
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
611+
&& if [ -f "/opt/nvm/nvm.sh" ]; then \
612+
ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
613+
\
614+
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
615+
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
616+
fi \
610617
\
611618
&& (rm -rf /home/devilbox/.*json || true) \
612619
&& (rm -rf /home/devilbox/.ansible || true) \

‎Dockerfiles/work/Dockerfile-7.3

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,12 @@ RUN set -eux \
154154
###
155155
RUN set -eux \
156156
# -------------------- composer --------------------
157-
&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
158-
&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
157+
&& COMPOSER_1_VERSION="latest-1.x" \
158+
&& COMPOSER_2_VERSION="latest-2.x" \
159+
&& COMPOSER_2_VERSION="" \
160+
\
161+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
162+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
159163
&& chmod +x /usr/local/bin/composer-1 \
160164
&& chmod +x /usr/local/bin/composer-2 \
161165
\
@@ -604,10 +608,13 @@ RUN set -eux \
604608
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
605609
\
606610
\
607-
&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
608611
\
609-
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
610-
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
612+
&& if [ -f "/opt/nvm/nvm.sh" ]; then \
613+
ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
614+
\
615+
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
616+
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
617+
fi \
611618
\
612619
&& (rm -rf /home/devilbox/.*json || true) \
613620
&& (rm -rf /home/devilbox/.ansible || true) \

‎Dockerfiles/work/Dockerfile-7.4

Lines changed: 12 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -154,8 +154,12 @@ RUN set -eux \
154154
###
155155
RUN set -eux \
156156
# -------------------- composer --------------------
157-
&& curl -sS -L --fail https://getcomposer.org/composer-1.phar > /usr/local/bin/composer-1 \
158-
&& curl -sS -L --fail https://getcomposer.org/composer-2.phar > /usr/local/bin/composer-2 \
157+
&& COMPOSER_1_VERSION="latest-1.x" \
158+
&& COMPOSER_2_VERSION="latest-2.x" \
159+
&& COMPOSER_2_VERSION="" \
160+
\
161+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_1_VERSION}/composer.phar" > /usr/local/bin/composer-1 \
162+
&& curl -sS -L --fail "https://getcomposer.org/download/${COMPOSER_2_VERSION}/composer.phar" > /usr/local/bin/composer-2 \
159163
&& chmod +x /usr/local/bin/composer-1 \
160164
&& chmod +x /usr/local/bin/composer-2 \
161165
\
@@ -604,10 +608,13 @@ RUN set -eux \
604608
&& su -c '. /opt/nvm/nvm.sh; npm install -g --force webpack-cli' devilbox \
605609
\
606610
\
607-
&& ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
608611
\
609-
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
610-
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox \
612+
&& if [ -f "/opt/nvm/nvm.sh" ]; then \
613+
ln -sf $(dirname $(su -c '. /opt/nvm/nvm.sh; nvm which current' devilbox))/* /usr/local/bin/ \
614+
\
615+
&& su -c '. /opt/nvm/nvm.sh; npm cache clear --force' devilbox \
616+
&& su -c '. /opt/nvm/nvm.sh; nvm cache clear --force' devilbox; \
617+
fi \
611618
\
612619
&& (rm -rf /home/devilbox/.*json || true) \
613620
&& (rm -rf /home/devilbox/.ansible || true) \

0 commit comments

Comments
 (0)