Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403642 )
Change subject: Migrate composer to docker-pkg ...................................................................... Migrate composer to docker-pkg Change-Id: Ieaee9bc2714cc065399de093710c3253b240d5f9 --- D dockerfiles/composer/Dockerfile A dockerfiles/composer/Dockerfile.template A dockerfiles/composer/changelog A dockerfiles/composer/control D dockerfiles/composer/prebuild.sh 5 files changed, 22 insertions(+), 27 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/42/403642/1 diff --git a/dockerfiles/composer/Dockerfile b/dockerfiles/composer/Dockerfile deleted file mode 100644 index ad8f92a..0000000 --- a/dockerfiles/composer/Dockerfile +++ /dev/null @@ -1,18 +0,0 @@ -FROM docker-registry.wikimedia.org/releng/php:latest - -USER root - -COPY .cache-buster-composer /.cache-buster-composer - -RUN git clone --depth 1 https://gerrit.wikimedia.org/r/p/integration/composer.git /srv/composer && \ - rm -rf /srv/composer/.git -RUN ln -s /srv/composer/vendor/bin/composer /usr/bin/composer - -USER nobody - -# If a later dockerfile enables xdebug, don't -# spam warnings about it. -ENV COMPOSER_DISABLE_XDEBUG_WARN=1 - -ENTRYPOINT ["/srv/composer/vendor/bin/composer"] -CMD ["help"] diff --git a/dockerfiles/composer/Dockerfile.template b/dockerfiles/composer/Dockerfile.template new file mode 100644 index 0000000..d9afb83 --- /dev/null +++ b/dockerfiles/composer/Dockerfile.template @@ -0,0 +1,16 @@ +FROM {{ "php" | image_tag }} + +USER root + +RUN git clone --depth 1 https://gerrit.wikimedia.org/r/p/integration/composer.git /srv/composer \ + && rm -rf /srv/composer/.git \ + && ln -s /srv/composer/vendor/bin/composer /usr/bin/composer + +USER nobody + +# If a later dockerfile enables xdebug, don't +# spam warnings about it. +ENV COMPOSER_DISABLE_XDEBUG_WARN=1 + +ENTRYPOINT ["/srv/composer/vendor/bin/composer"] +CMD ["help"] diff --git a/dockerfiles/composer/changelog b/dockerfiles/composer/changelog new file mode 100644 index 0000000..3eb67f1 --- /dev/null +++ b/dockerfiles/composer/changelog @@ -0,0 +1,5 @@ +composer (0.1.0) wikimedia; urgency=medium + + * Initial port to docker-pkg. + + -- Antoine Musso <[email protected]> Thu, 11 Jan 2018 14:15:46 +0100 diff --git a/dockerfiles/composer/control b/dockerfiles/composer/control new file mode 100644 index 0000000..4be4b08 --- /dev/null +++ b/dockerfiles/composer/control @@ -0,0 +1 @@ +Depends: php diff --git a/dockerfiles/composer/prebuild.sh b/dockerfiles/composer/prebuild.sh deleted file mode 100755 index ef2e5ca..0000000 --- a/dockerfiles/composer/prebuild.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -set -e - -# This is copied in Dockerfile to ensure that a build step grabs a fresh -# copy of the git repo when it is updated rather than using a layer from -# the local Docker cache. - -git ls-remote --exit-code https://gerrit.wikimedia.org/r/p/integration/composer.git refs/heads/master > .cache-buster-composer -- To view, visit https://gerrit.wikimedia.org/r/403642 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Ieaee9bc2714cc065399de093710c3253b240d5f9 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <[email protected]> _______________________________________________ MediaWiki-commits mailing list [email protected] https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
