jenkins-bot has submitted this change and it was merged. ( 
https://gerrit.wikimedia.org/r/369838 )

Change subject: Install composer for PHP images
......................................................................


Install composer for PHP images

Use the same git clone method that is used by the ::toollabs::composer
Puppet module to provision composer in the PHP base image. It's not
pretty, but it is consistent.

Bug: T172358
Change-Id: I9a5d485bac1d65777437f407b8bc9923de7679fa
---
M php/base/Dockerfile.template
1 file changed, 6 insertions(+), 0 deletions(-)

Approvals:
  BryanDavis: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/php/base/Dockerfile.template b/php/base/Dockerfile.template
index 16a0c79..93e32e5 100644
--- a/php/base/Dockerfile.template
+++ b/php/base/Dockerfile.template
@@ -19,3 +19,9 @@
     php5-xsl \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
+
+# T172358 - install composer simlarly to ::toollabs::composer
+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/local/bin/composer

-- 
To view, visit https://gerrit.wikimedia.org/r/369838
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I9a5d485bac1d65777437f407b8bc9923de7679fa
Gerrit-PatchSet: 3
Gerrit-Project: operations/docker-images/toollabs-images
Gerrit-Branch: master
Gerrit-Owner: BryanDavis <[email protected]>
Gerrit-Reviewer: Addshore <[email protected]>
Gerrit-Reviewer: BryanDavis <[email protected]>
Gerrit-Reviewer: Krinkle <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to