Install composer from composer image

diff --git a/README.md b/README.md
index 3ddd2fdc8abd1658a0d19d720b88ad02437467ab..202ebffdcd68f21ad6963f1f2106640f141dae66 100644 (file)
--- 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 fbf996ae56b485a92d1e1704f0be1a10b78b1409..8ce818a662fced211f25833f5877638723d78a8e 100644 (file)
--- 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 bf0f33c17df3e32fe6cd1975d2a62a362ee97f9d..3ca55d1a4788ff45222b8b181b48fb0dd9ce950d 100644 (file)
--- 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 df55482ad7a7eb8aefefc8514072ac38e13e9892..01b0f7a8726817450bbfca1ef78ec713ac071f9c 100644 (file)
--- 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 d6da23e4a509f0b264b2abafb5988230f81187c6..0918b607b9e01c44a870c97bb793c264755df3e7 100644 (file)
--- 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 035c3283221d72bd9ff042c8327af035ee438122..53e4dd9ec162c0ab0e5853092d98585f001f0630 100644 (file)
--- 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