[incubator-openwhisk] branch master updated: Install composer in its own layer (#2641)

[cs...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

csantanapr pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-openwhisk.git


The following commit(s) were added to refs/heads/master by this push:
     new 4bf2236  Install composer in its own layer (#2641)
4bf2236 is described below

commit 4bf22365d1dbee6719de0a83e2fa2eea7d68c3cf
Author: Rob Allen <ro...@akrabat.com>
AuthorDate: Thu Aug 17 21:50:36 2017 +0100

    Install composer in its own layer (#2641)
    
    Composer installation seems to fail sometimes in the CI build
    environment. Move the installation of composer to a separate layer and
    separate the download of the file via curl from the installation
    process. Finally, run `composer --version` to ensure that it has been
    installed correctly.
---
 core/php7.1Action/Dockerfile | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/php7.1Action/Dockerfile b/core/php7.1Action/Dockerfile
index c5b74ae..a37ed52 100644
--- a/core/php7.1Action/Dockerfile
+++ b/core/php7.1Action/Dockerfile
@@ -27,12 +27,12 @@ RUN \
        bcmath \
        zip \
        gd \
-       soap \
+       soap
 
-   && \
-
-    # install Composer
-    cd /tmp && curl -sS https://getcomposer.org/installer | php  -- --install-dir=/usr/bin --filename=composer
+# install composer
+RUN curl -s -f -L -o /tmp/installer.php https://getcomposer.org/installer \
+    && php /tmp/installer.php --no-ansi --install-dir=/usr/bin --filename=composer \
+    && composer --ansi --version --no-interaction
 
 # create src directory to store action files
 RUN mkdir -p /action/src

-- 
To stop receiving notification emails like this one, please contact
['"commits@openwhisk.apache.org" <co...@openwhisk.apache.org>'].