Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403666 )
Change subject: Rebuild using composer from docker-registry
......................................................................
Rebuild using composer from docker-registry
Change-Id: If49d9556d24bdacbee5eba5f091e1a94636e7d4f
---
M dockerfiles/composer-hhvm/Dockerfile.template
M dockerfiles/composer-hhvm/changelog
M dockerfiles/composer-hhvm/control
M dockerfiles/composer-php55/Dockerfile.template
M dockerfiles/composer-php55/changelog
M dockerfiles/composer-php55/control
6 files changed, 18 insertions(+), 4 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/66/403666/1
diff --git a/dockerfiles/composer-hhvm/Dockerfile.template
b/dockerfiles/composer-hhvm/Dockerfile.template
index 60c3f4e..2f9f2ea 100644
--- a/dockerfiles/composer-hhvm/Dockerfile.template
+++ b/dockerfiles/composer-hhvm/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/composer:latest as composer
+FROM {{ "composer" | image_tag }} as composer
FROM {{ "hhvm" | image_tag }}
diff --git a/dockerfiles/composer-hhvm/changelog
b/dockerfiles/composer-hhvm/changelog
index bdcbeb1..363a455 100644
--- a/dockerfiles/composer-hhvm/changelog
+++ b/dockerfiles/composer-hhvm/changelog
@@ -1,3 +1,10 @@
+composer-hhvm (0.2.0) wikimedia; urgency=medium
+
+ * Rebuild with docker-registry.wikimedia.org/releng/composer
+ * Add composer to Depends
+
+ -- Antoine Musso <[email protected]> Thu, 11 Jan 2018 15:53:01 +0100
+
composer-hhvm (0.1.3) wikimedia; urgency=medium
* Use {{ image_tag }} filter
diff --git a/dockerfiles/composer-hhvm/control
b/dockerfiles/composer-hhvm/control
index b3f7435..16d922c 100644
--- a/dockerfiles/composer-hhvm/control
+++ b/dockerfiles/composer-hhvm/control
@@ -1 +1 @@
-Depends: hhvm
+Depends: hhvm, composer
diff --git a/dockerfiles/composer-php55/Dockerfile.template
b/dockerfiles/composer-php55/Dockerfile.template
index 8bc6496..5914bd5 100644
--- a/dockerfiles/composer-php55/Dockerfile.template
+++ b/dockerfiles/composer-php55/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/composer:latest as composer
+FROM {{ "composer" | image_tag }} as composer
FROM {{ "php55" | image_tag }}
diff --git a/dockerfiles/composer-php55/changelog
b/dockerfiles/composer-php55/changelog
index 3dfc4bf..7079dbb 100644
--- a/dockerfiles/composer-php55/changelog
+++ b/dockerfiles/composer-php55/changelog
@@ -1,3 +1,10 @@
+composer-php55 (0.2.0) wikimedia; urgency=medium
+
+ * Rebuild with docker-registry.wikimedia.org/releng/composer
+ * Add composer to Depends
+
+ -- Antoine Musso <[email protected]> Thu, 11 Jan 2018 15:53:37 +0100
+
composer-php55 (0.1.1) wikimedia; urgency=medium
* Use {{ image_tag }} filter
diff --git a/dockerfiles/composer-php55/control
b/dockerfiles/composer-php55/control
index 9690b0b..afe20f3 100644
--- a/dockerfiles/composer-php55/control
+++ b/dockerfiles/composer-php55/control
@@ -1 +1 @@
-Depends: php55
+Depends: php55, composer
--
To view, visit https://gerrit.wikimedia.org/r/403666
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If49d9556d24bdacbee5eba5f091e1a94636e7d4f
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
