fix composer during build

webdevops · Oct 27, 2020 · 40305a2 · 40305a2
1 parent 8f981bb
commit 40305a2
Show file tree

Hide file tree

Showing 62 changed files with 77 additions and 30 deletions.
diff --git a/docker/php-official/5.6/Dockerfile b/docker/php-official/5.6/Dockerfile
@@ -225,6 +225,7 @@ RUN set -x \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php-official/5.6/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/5.6/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php-official/7.0/Dockerfile b/docker/php-official/7.0/Dockerfile
@@ -230,6 +230,7 @@ RUN set -x \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php-official/7.0/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.0/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php-official/7.1-alpine/Dockerfile b/docker/php-official/7.1-alpine/Dockerfile
@@ -245,6 +245,7 @@ RUN set -x \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.1-alpine/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php-official/7.1/Dockerfile b/docker/php-official/7.1/Dockerfile
@@ -230,6 +230,7 @@ RUN set -x \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php-official/7.1/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.1/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php-official/7.2-alpine/Dockerfile b/docker/php-official/7.2-alpine/Dockerfile
@@ -249,6 +249,7 @@ RUN set -x \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.2-alpine/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php-official/7.2/Dockerfile b/docker/php-official/7.2/Dockerfile
@@ -229,6 +229,7 @@ RUN set -x \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php-official/7.2/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.2/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php-official/7.3-alpine/Dockerfile b/docker/php-official/7.3-alpine/Dockerfile
@@ -249,6 +249,7 @@ RUN set -x \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php-official/7.3-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.3-alpine/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php-official/7.3/Dockerfile b/docker/php-official/7.3/Dockerfile
@@ -233,6 +233,7 @@ RUN set -x \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php-official/7.3/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.3/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php-official/7.4-alpine/Dockerfile b/docker/php-official/7.4-alpine/Dockerfile
@@ -249,6 +249,7 @@ RUN set -x \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php-official/7.4-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.4-alpine/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php-official/7.4/Dockerfile b/docker/php-official/7.4/Dockerfile
@@ -232,6 +232,7 @@ RUN set -x \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php-official/7.4/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/7.4/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php-official/8.0-alpine/Dockerfile b/docker/php-official/8.0-alpine/Dockerfile
@@ -251,6 +251,7 @@ RUN set -x \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php-official/8.0-alpine/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.0-alpine/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php-official/8.0/Dockerfile b/docker/php-official/8.0/Dockerfile
@@ -221,6 +221,7 @@ RUN set -x \
     && rm -f /usr/local/etc/php-fpm.d/zz-docker.conf \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php-official/8.0/conf/provision/entrypoint.d/20-php.sh b/docker/php-official/8.0/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/centos-7-php56/Dockerfile b/docker/php/centos-7-php56/Dockerfile
@@ -55,6 +55,7 @@ RUN set -x \
     # && pecl install redis \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Cleanup
     && yum erase -y php-devel gcc \
     # Enable php services

diff --git a/docker/php/centos-7-php56/conf/provision/entrypoint.d/20-php.sh b/docker/php/centos-7-php56/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/centos-7-php7/Dockerfile b/docker/php/centos-7-php7/Dockerfile
@@ -58,6 +58,7 @@ RUN set -x \
     && pecl channel-update pecl.php.net \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     && pecl install redis \
     && echo "extension=redis.so" > /etc/php.d/redis.ini \
     && yum remove -y ImageMagick-devel php70w-devel gcc make \

diff --git a/docker/php/centos-7-php7/conf/provision/entrypoint.d/20-php.sh b/docker/php/centos-7-php7/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/centos-7/Dockerfile b/docker/php/centos-7/Dockerfile
@@ -60,6 +60,7 @@ RUN set -x \
     && pecl install imagick \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Cleanup
     && yum erase -y php-devel gcc \
     # Enable php services

diff --git a/docker/php/centos-7/conf/provision/entrypoint.d/20-php.sh b/docker/php/centos-7/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/debian-10/Dockerfile b/docker/php/debian-10/Dockerfile
@@ -58,6 +58,7 @@ RUN set -x \
     && pecl channel-update pecl.php.net \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php/debian-10/conf/provision/entrypoint.d/20-php.sh b/docker/php/debian-10/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/debian-7/Dockerfile b/docker/php/debian-7/Dockerfile
@@ -51,6 +51,7 @@ RUN set -x \
     && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php/debian-7/conf/provision/entrypoint.d/20-php.sh b/docker/php/debian-7/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/debian-8-php7/Dockerfile b/docker/php/debian-8-php7/Dockerfile
@@ -69,6 +69,7 @@ RUN set -x \
         php-amqp \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php/debian-8-php7/conf/provision/entrypoint.d/20-php.sh b/docker/php/debian-8-php7/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/debian-8/Dockerfile b/docker/php/debian-8/Dockerfile
@@ -52,6 +52,7 @@ RUN set -x \
     && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php/debian-8/conf/provision/entrypoint.d/20-php.sh b/docker/php/debian-8/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/debian-9/Dockerfile b/docker/php/debian-9/Dockerfile
@@ -60,6 +60,7 @@ RUN set -x \
     && pecl channel-update pecl.php.net \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php/debian-9/conf/provision/entrypoint.d/20-php.sh b/docker/php/debian-9/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/ubuntu-12.04/Dockerfile b/docker/php/ubuntu-12.04/Dockerfile
@@ -52,6 +52,7 @@ RUN set -x \
     && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php/ubuntu-12.04/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-12.04/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/ubuntu-14.04/Dockerfile b/docker/php/ubuntu-14.04/Dockerfile
@@ -53,6 +53,7 @@ RUN set -x \
     && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php/ubuntu-14.04/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-14.04/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/ubuntu-15.04/Dockerfile b/docker/php/ubuntu-15.04/Dockerfile
@@ -53,6 +53,7 @@ RUN set -x \
     && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php/ubuntu-15.04/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-15.04/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/ubuntu-15.10/Dockerfile b/docker/php/ubuntu-15.10/Dockerfile
@@ -53,6 +53,7 @@ RUN set -x \
     && ln -sf /etc/php5/mods-available/mcrypt.in /etc/php5/fpm/conf.d/20-mcrypt.ini \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php/ubuntu-15.10/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-15.10/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/ubuntu-16.04/Dockerfile b/docker/php/ubuntu-16.04/Dockerfile
@@ -60,6 +60,7 @@ RUN set -x \
     && pecl channel-update pecl.php.net \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php/ubuntu-16.04/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-16.04/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/ubuntu-16.10/Dockerfile b/docker/php/ubuntu-16.10/Dockerfile
@@ -60,6 +60,7 @@ RUN set -x \
     && pecl channel-update pecl.php.net \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php/ubuntu-16.10/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-16.10/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/ubuntu-17.04/Dockerfile b/docker/php/ubuntu-17.04/Dockerfile
@@ -60,6 +60,7 @@ RUN set -x \
     && pecl channel-update pecl.php.net \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \

diff --git a/docker/php/ubuntu-17.04/conf/provision/entrypoint.d/20-php.sh b/docker/php/ubuntu-17.04/conf/provision/entrypoint.d/20-php.sh
@@ -72,4 +72,4 @@ if [[ -n "${PHP_DISMOD+x}" ]]; then
 fi
 
 # Link composer version accordingly
-ln -s /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
+ln -sf /usr/local/bin/composer${COMPOSER_VERSION:-2} /usr/local/bin/composer
diff --git a/docker/php/ubuntu-17.10/Dockerfile b/docker/php/ubuntu-17.10/Dockerfile
@@ -60,6 +60,7 @@ RUN set -x \
     && pecl channel-update pecl.php.net \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer2 \
     && curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/local/bin/ --filename=composer1 --1 \
+    && ln -sf /usr/local/bin/composer2 /usr/local/bin/composer \
     # Enable php services
     && docker-service enable syslog \
     && docker-service enable cron \