Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/403659 )
Change subject: Use composer images from docker-registry
......................................................................
Use composer images from docker-registry
Update:
composer-hhvm-docker
composer-package-hhvm-docker
composer-package-php55-docker
composer-php55-docker
mwgate-composer-hhvm-docker
mwgate-composer-package-hhvm-docker
mwgate-composer-package-php55-docker
mwgate-composer-php55-docker
Change-Id: I4e17e2a1ee358932d6aaccb209fa587254d2a6ad
---
M dockerfiles/composer-package-hhvm/Dockerfile.template
M dockerfiles/composer-package-hhvm/changelog
M dockerfiles/composer-package-hhvm/control
M dockerfiles/composer-package-php55/Dockerfile.template
M dockerfiles/composer-package-php55/changelog
M dockerfiles/composer-package-php55/control
M dockerfiles/composer-test-hhvm/Dockerfile.template
M dockerfiles/composer-test-hhvm/changelog
M dockerfiles/composer-test-hhvm/control
M dockerfiles/composer-test-php55/Dockerfile.template
M dockerfiles/composer-test-php55/changelog
M dockerfiles/composer-test-php55/control
M jjb/mediawiki.yaml
M jjb/php.yaml
14 files changed, 48 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/59/403659/1
diff --git a/dockerfiles/composer-package-hhvm/Dockerfile.template
b/dockerfiles/composer-package-hhvm/Dockerfile.template
index 4e7bc4e..b8aba04 100644
--- a/dockerfiles/composer-package-hhvm/Dockerfile.template
+++ b/dockerfiles/composer-package-hhvm/Dockerfile.template
@@ -1,7 +1,7 @@
-FROM wmfreleng/composer-package
+FROM {{ "composer-package" | image_tag }} as composer-package
FROM {{ "composer-hhvm" | image_tag }}
USER nobody
-COPY --from=wmfreleng/composer-package /run.sh /run.sh
+COPY --from=composer-package /run.sh /run.sh
ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-package-hhvm/changelog
b/dockerfiles/composer-package-hhvm/changelog
index b3a357b..9884dbf 100644
--- a/dockerfiles/composer-package-hhvm/changelog
+++ b/dockerfiles/composer-package-hhvm/changelog
@@ -1,3 +1,10 @@
+composer-package-hhvm (0.2.0) wikimedia; urgency=medium
+
+ * Rebuild with docker-registry.wikimedia.org/releng/composer-package
+ * Add composer-package to Depends
+
+ -- Antoine Musso <[email protected]> Thu, 11 Jan 2018 15:28:39 +0100
+
composer-package-hhvm (0.1.3) wikimedia; urgency=medium
* Use {{ image_tag }} filter
diff --git a/dockerfiles/composer-package-hhvm/control
b/dockerfiles/composer-package-hhvm/control
index d675692..f2e6d4a 100644
--- a/dockerfiles/composer-package-hhvm/control
+++ b/dockerfiles/composer-package-hhvm/control
@@ -1 +1 @@
-Depends: composer-hhvm
+Depends: composer-hhvm, composer-package
diff --git a/dockerfiles/composer-package-php55/Dockerfile.template
b/dockerfiles/composer-package-php55/Dockerfile.template
index f23c8c2..446d90f 100644
--- a/dockerfiles/composer-package-php55/Dockerfile.template
+++ b/dockerfiles/composer-package-php55/Dockerfile.template
@@ -1,7 +1,7 @@
-FROM wmfreleng/composer-package
+FROM {{ "composer-package" | image_tag }} as composer-package
FROM {{ "composer-php55" | image_tag }}
USER nobody
-COPY --from=wmfreleng/composer-package /run.sh /run.sh
+COPY --from=composer-package /run.sh /run.sh
ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-package-php55/changelog
b/dockerfiles/composer-package-php55/changelog
index 025bf26..b7dc6ca 100644
--- a/dockerfiles/composer-package-php55/changelog
+++ b/dockerfiles/composer-package-php55/changelog
@@ -1,3 +1,10 @@
+composer-package-php55 (0.2.0) wikimedia; urgency=medium
+
+ * Rebuild with docker-registry.wikimedia.org/releng/composer-package
+ * Add composer-package to Depends
+
+ -- Antoine Musso <[email protected]> Thu, 11 Jan 2018 15:37:11 +0100
+
composer-package-php55 (0.1.1) wikimedia; urgency=medium
* Use {{ image_tag }} filter
diff --git a/dockerfiles/composer-package-php55/control
b/dockerfiles/composer-package-php55/control
index 03313c5..9ade185 100644
--- a/dockerfiles/composer-package-php55/control
+++ b/dockerfiles/composer-package-php55/control
@@ -1 +1 @@
-Depends: composer-php55
+Depends: composer-php55, composer-package
diff --git a/dockerfiles/composer-test-hhvm/Dockerfile.template
b/dockerfiles/composer-test-hhvm/Dockerfile.template
index 88783a0..4d55d64 100644
--- a/dockerfiles/composer-test-hhvm/Dockerfile.template
+++ b/dockerfiles/composer-test-hhvm/Dockerfile.template
@@ -1,7 +1,7 @@
-FROM wmfreleng/composer-test
+FROM {{ "composer-test" | image_tag }} as composer-test
FROM {{ "composer-hhvm" | image_tag }}
USER nobody
-COPY --from=wmfreleng/composer-test /run.sh /run.sh
+COPY --from=composer-test /run.sh /run.sh
ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-test-hhvm/changelog
b/dockerfiles/composer-test-hhvm/changelog
index 943ec87..e5b63a8 100644
--- a/dockerfiles/composer-test-hhvm/changelog
+++ b/dockerfiles/composer-test-hhvm/changelog
@@ -1,3 +1,10 @@
+composer-test-hhvm (0.2.0) wikimedia; urgency=medium
+
+ * Rebuild with docker-registry.wikimedia.org/releng/composer-test
+ * Add composer-test to Depends:
+
+ -- Antoine Musso <[email protected]> Thu, 11 Jan 2018 15:33:46 +0100
+
composer-test-hhvm (0.1.3) wikimedia; urgency=medium
* Use {{ image_tag }} filter
diff --git a/dockerfiles/composer-test-hhvm/control
b/dockerfiles/composer-test-hhvm/control
index d675692..590d12c 100644
--- a/dockerfiles/composer-test-hhvm/control
+++ b/dockerfiles/composer-test-hhvm/control
@@ -1 +1 @@
-Depends: composer-hhvm
+Depends: composer-hhvm, composer-test
diff --git a/dockerfiles/composer-test-php55/Dockerfile.template
b/dockerfiles/composer-test-php55/Dockerfile.template
index d09cec3..5009a11 100644
--- a/dockerfiles/composer-test-php55/Dockerfile.template
+++ b/dockerfiles/composer-test-php55/Dockerfile.template
@@ -1,7 +1,7 @@
-FROM wmfreleng/composer-test
+FROM {{ "composer-test" | image_tag }} as composer-test
FROM {{ "composer-php55" | image_tag }}
USER nobody
-COPY --from=wmfreleng/composer-test /run.sh /run.sh
+COPY --from=composer-test /run.sh /run.sh
ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/composer-test-php55/changelog
b/dockerfiles/composer-test-php55/changelog
index e34fb29..6b53734 100644
--- a/dockerfiles/composer-test-php55/changelog
+++ b/dockerfiles/composer-test-php55/changelog
@@ -1,3 +1,10 @@
+composer-test-php55 (0.2.0) wikimedia; urgency=medium
+
+ * Rebuild with docker-registry.wikimedia.org/releng/composer-test
+ * Add composer-test to Depends:
+
+ -- Antoine Musso <[email protected]> Thu, 11 Jan 2018 15:34:35 +0100
+
composer-test-php55 (0.1.1) wikimedia; urgency=medium
* Use {{ image_tag }} filter
diff --git a/dockerfiles/composer-test-php55/control
b/dockerfiles/composer-test-php55/control
index 03313c5..82d774f 100644
--- a/dockerfiles/composer-test-php55/control
+++ b/dockerfiles/composer-test-php55/control
@@ -1 +1 @@
-Depends: composer-php55
+Depends: composer-php55, composer-test
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 1388424..0f7ef9a 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -263,17 +263,17 @@
- '{name}-composer-package-{phpflavor}-docker': &phpflavor_docker
phpflavor:
- hhvm:
- image:
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.1.3
+ image:
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.2.0
- php55:
- image:
docker-registry.wikimedia.org/releng/composer-package-php55:0.1.1
+ image:
docker-registry.wikimedia.org/releng/composer-package-php55:0.2.0
- php70:
image:
docker-registry.wikimedia.org/releng/composer-package:0.1.0
- '{name}-composer-{phpflavor}-docker':
phpflavor:
- hhvm:
- image:
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.1.3
+ image:
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.2.0
- php55:
- image:
docker-registry.wikimedia.org/releng/composer-test-php55:0.1.1
+ image:
docker-registry.wikimedia.org/releng/composer-test-php55:0.2.0
- php70:
image:
docker-registry.wikimedia.org/releng/composer-test:0.1.0
- '{name}-composer-validate'
diff --git a/jjb/php.yaml b/jjb/php.yaml
index d978d6f..cd10a72 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -203,16 +203,16 @@
- 'composer-package-{phpflavor}-docker':
phpflavor:
- hhvm:
- image:
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.1.3
+ image:
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.2.0
- php55:
- image:
docker-registry.wikimedia.org/releng/composer-package-php55:0.1.1
+ image:
docker-registry.wikimedia.org/releng/composer-package-php55:0.2.0
- php70:
image:
docker-registry.wikimedia.org/releng/composer-package:0.1.0
- 'composer-{phpflavor}-docker':
phpflavor:
- hhvm:
- image:
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.1.3
+ image:
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.2.0
- php55:
- image:
docker-registry.wikimedia.org/releng/composer-test-php55:0.1.1
+ image:
docker-registry.wikimedia.org/releng/composer-test-php55:0.2.0
- php70:
image:
docker-registry.wikimedia.org/releng/composer-test:0.1.0
--
To view, visit https://gerrit.wikimedia.org/r/403659
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I4e17e2a1ee358932d6aaccb209fa587254d2a6ad
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
