From: William Desportes <redacted>
Date: Wed, 18 Aug 2021 16:57:34 +0000 (+0200)
Subject: Install composer from composer image
X-Git-Url: http://git.99rst.org/?a=commitdiff_plain;h=c65e0fd09bcc6516db65ad6566bd801beb90e6af;p=roundcube-roundcubemail-docker.git

Install composer from composer image
---

diff --git a/README.md b/README.md
index 3ddd2fd..202ebff 100644
--- a/README.md
+++ b/README.md
@@ -113,13 +113,14 @@ For instance, you could extend this image to add composer and install requiremen
 ```Dockerfile
 FROM roundcube/roundcubemail:latest
 
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
+
 RUN set -ex; \
     apt-get update; \
     apt-get install -y --no-install-recommends \
         git \
     ; \
     \
-    curl -sS https://getcomposer.org/installer | php -- --install-dir=/usr/bin --filename=composer; \
     mv /usr/src/roundcubemail/composer.json-dist /usr/src/roundcubemail/composer.json; \
     \
     composer \
diff --git a/apache/Dockerfile b/apache/Dockerfile
index fbf996a..8ce818a 100644
--- a/apache/Dockerfile
+++ b/apache/Dockerfile
@@ -57,11 +57,7 @@ RUN set -ex; \
 	; \
 	rm -rf /var/lib/apt/lists/*
 
-# ... and composer.phar
-ADD https://getcomposer.org/installer /tmp/composer-installer.php
-
-RUN php /tmp/composer-installer.php --install-dir=/usr/local/bin/; \
-	rm /tmp/composer-installer.php
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
 
 RUN a2enmod rewrite
diff --git a/fpm-alpine/Dockerfile b/fpm-alpine/Dockerfile
index bf0f33c..3ca55d1 100644
--- a/fpm-alpine/Dockerfile
+++ b/fpm-alpine/Dockerfile
@@ -49,11 +49,7 @@ RUN set -ex; \
 	apk add --virtual .roundcubemail-phpext-rundeps imagemagick $runDeps; \
 	apk del .build-deps
 
-# add composer.phar
-ADD https://getcomposer.org/installer /tmp/composer-installer.php
-
-RUN php /tmp/composer-installer.php --install-dir=/usr/local/bin/; \
-	rm /tmp/composer-installer.php
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
 
 # expose these volumes
diff --git a/fpm/Dockerfile b/fpm/Dockerfile
index df55482..01b0f7a 100644
--- a/fpm/Dockerfile
+++ b/fpm/Dockerfile
@@ -57,11 +57,7 @@ RUN set -ex; \
 	; \
 	rm -rf /var/lib/apt/lists/*
 
-# ... and composer.phar
-ADD https://getcomposer.org/installer /tmp/composer-installer.php
-
-RUN php /tmp/composer-installer.php --install-dir=/usr/local/bin/; \
-	rm /tmp/composer-installer.php
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 
 
 # expose these volumes
diff --git a/templates/Dockerfile-alpine.templ b/templates/Dockerfile-alpine.templ
index d6da23e..0918b60 100644
--- a/templates/Dockerfile-alpine.templ
+++ b/templates/Dockerfile-alpine.templ
@@ -49,11 +49,7 @@ RUN set -ex; \
 	apk add --virtual .roundcubemail-phpext-rundeps imagemagick $runDeps; \
 	apk del .build-deps
 
-# add composer.phar
-ADD https://getcomposer.org/installer /tmp/composer-installer.php
-
-RUN php /tmp/composer-installer.php --install-dir=/usr/local/bin/; \
-	rm /tmp/composer-installer.php
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 %%EXTRAS%%
 
 # expose these volumes
diff --git a/templates/Dockerfile-debian.templ b/templates/Dockerfile-debian.templ
index 035c328..53e4dd9 100644
--- a/templates/Dockerfile-debian.templ
+++ b/templates/Dockerfile-debian.templ
@@ -57,11 +57,7 @@ RUN set -ex; \
 	; \
 	rm -rf /var/lib/apt/lists/*
 
-# ... and composer.phar
-ADD https://getcomposer.org/installer /tmp/composer-installer.php
-
-RUN php /tmp/composer-installer.php --install-dir=/usr/local/bin/; \
-	rm /tmp/composer-installer.php
+COPY --from=composer:2 /usr/bin/composer /usr/bin/composer
 %%EXTRAS%%
 
 # expose these volumes