Merge pull request #29 from jakzal/composer-image

Copy composer from the official image
jakzal · Jan 12, 2018 · 2718910 · 2718910
2 parents 528ddf4 + 1630ae5
commit 2718910
Show file tree

Hide file tree

Showing 4 changed files with 3 additions and 21 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -11,7 +11,7 @@ ENV TOOLS_JSON=/root/tools.json
 
 COPY tools.json ${TOOLS_JSON}
 COPY tools.php /usr/local/bin/tools.php
-COPY install-composer.sh /usr/local/bin/install-composer.sh
+COPY --from=composer:1.6 /usr/bin/composer /usr/bin/composer
 
 RUN apt-get update && apt-get install -y --no-install-recommends $TOOL_DEPS $BUILD_DEPS $LIB_DEPS && rm -rf /var/lib/apt/lists/* \
  && git clone https://github.com/nikic/php-ast.git && cd php-ast && phpize && ./configure && make && make install && cd .. && rm -rf php-ast && docker-php-ext-enable ast \

diff --git a/Dockerfile-alpine b/Dockerfile-alpine
@@ -11,7 +11,7 @@ ENV TOOLS_JSON=/root/tools.json
 
 COPY tools.json ${TOOLS_JSON}
 COPY tools.php /usr/local/bin/tools.php
-COPY install-composer.sh /usr/local/bin/install-composer.sh
+COPY --from=composer:1.6 /usr/bin/composer /usr/bin/composer
 
 RUN apk add --no-cache --virtual .tool-deps $TOOL_DEPS $LIB_DEPS \
  && apk add --no-cache --virtual .build-deps $BUILD_DEPS \

diff --git a/install-composer.sh b/install-composer.sh
diff --git a/tools.php b/tools.php
@@ -478,7 +478,7 @@ function LoadTools(string $source): PleaseTry
                 'composer',
                 'Dependency Manager for PHP',
                 'https://getcomposer.org/',
-                new ShCommand('/usr/local/bin/install-composer.sh'),
+                new ShCommand('composer self-update'),
                 new TestCommand('composer list', 'composer')
             ),
             new Tool(