Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399612 )
Change subject: docker: docker fix hhvm docker-pkg definitions
......................................................................
docker: docker fix hhvm docker-pkg definitions
* Use {{ image_tag }} filter
* Mark dependency via control
Update the composer hhvm jobs.
Change-Id: Ia3dc26910413881a3f7ead9711d85878b836f5de
---
M dockerfiles/composer-hhvm/Dockerfile.template
M dockerfiles/composer-hhvm/changelog
M dockerfiles/composer-package-hhvm/Dockerfile.template
M dockerfiles/composer-package-hhvm/changelog
M dockerfiles/composer-test-hhvm/Dockerfile.template
M dockerfiles/composer-test-hhvm/changelog
M dockerfiles/hhvm/Dockerfile.template
M dockerfiles/hhvm/changelog
A dockerfiles/hhvm/control
M jjb/mediawiki.yaml
M jjb/php.yaml
11 files changed, 37 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/12/399612/1
diff --git a/dockerfiles/composer-hhvm/Dockerfile.template
b/dockerfiles/composer-hhvm/Dockerfile.template
index 783074a..60c3f4e 100644
--- a/dockerfiles/composer-hhvm/Dockerfile.template
+++ b/dockerfiles/composer-hhvm/Dockerfile.template
@@ -1,6 +1,6 @@
FROM wmfreleng/composer:latest as composer
-FROM docker-registry.wikimedia.org/releng/hhvm:latest
+FROM {{ "hhvm" | image_tag }}
COPY --from=composer /srv/composer /srv/composer
COPY --from=composer /.cache-buster-composer /.cache-buster-composer
diff --git a/dockerfiles/composer-hhvm/changelog
b/dockerfiles/composer-hhvm/changelog
index 365e05f..30848b2 100644
--- a/dockerfiles/composer-hhvm/changelog
+++ b/dockerfiles/composer-hhvm/changelog
@@ -1,3 +1,10 @@
+composer-hhvm (0.1.3) wikimedia; urgency=medium
+
+ * Use {{ image_tag }} filter
+ * Mark dependency via control
+
+ -- Antoine Musso <[email protected]> Thu, 21 Dec 2017 13:13:55 +0100
+
composer-hhvm (0.1.2) wikimedia; urgency=medium
* Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.2
diff --git a/dockerfiles/composer-package-hhvm/Dockerfile.template
b/dockerfiles/composer-package-hhvm/Dockerfile.template
index a394acf..4e7bc4e 100644
--- a/dockerfiles/composer-package-hhvm/Dockerfile.template
+++ b/dockerfiles/composer-package-hhvm/Dockerfile.template
@@ -1,6 +1,6 @@
FROM wmfreleng/composer-package
-FROM docker-registry.wikimedia.org/releng/composer-hhvm:latest
+FROM {{ "composer-hhvm" | image_tag }}
USER nobody
COPY --from=wmfreleng/composer-package /run.sh /run.sh
diff --git a/dockerfiles/composer-package-hhvm/changelog
b/dockerfiles/composer-package-hhvm/changelog
index 4851d27..c1f116f 100644
--- a/dockerfiles/composer-package-hhvm/changelog
+++ b/dockerfiles/composer-package-hhvm/changelog
@@ -1,3 +1,10 @@
+composer-package-hhvm (0.1.3) wikimedia; urgency=medium
+
+ * Use {{ image_tag }} filter
+ * Mark dependency via control
+
+ -- Antoine Musso <[email protected]> Thu, 21 Dec 2017 13:13:55 +0100
+
composer-package-hhvm (0.1.2) wikimedia; urgency=medium
* Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.2
diff --git a/dockerfiles/composer-test-hhvm/Dockerfile.template
b/dockerfiles/composer-test-hhvm/Dockerfile.template
index 04a9ddc..88783a0 100644
--- a/dockerfiles/composer-test-hhvm/Dockerfile.template
+++ b/dockerfiles/composer-test-hhvm/Dockerfile.template
@@ -1,6 +1,6 @@
FROM wmfreleng/composer-test
-FROM docker-registry.wikimedia.org/releng/composer-hhvm:latest
+FROM {{ "composer-hhvm" | image_tag }}
USER nobody
COPY --from=wmfreleng/composer-test /run.sh /run.sh
diff --git a/dockerfiles/composer-test-hhvm/changelog
b/dockerfiles/composer-test-hhvm/changelog
index c48a558..20c19e5 100644
--- a/dockerfiles/composer-test-hhvm/changelog
+++ b/dockerfiles/composer-test-hhvm/changelog
@@ -1,3 +1,10 @@
+composer-test-hhvm (0.1.3) wikimedia; urgency=medium
+
+ * Use {{ image_tag }} filter
+ * Mark dependency via control
+
+ -- Antoine Musso <[email protected]> Thu, 21 Dec 2017 13:13:55 +0100
+
composer-test-hhvm (0.1.2) wikimedia; urgency=medium
* Rebuild with docker-registry.wikimedia.org/releng/hhvm:0.1.2
diff --git a/dockerfiles/hhvm/Dockerfile.template
b/dockerfiles/hhvm/Dockerfile.template
index e19ffde..6be22e5 100644
--- a/dockerfiles/hhvm/Dockerfile.template
+++ b/dockerfiles/hhvm/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM docker-registry.wikimedia.org/releng/ci-stretch:latest
+FROM {{ "ci-stretch" | image_tag }}
USER root
diff --git a/dockerfiles/hhvm/changelog b/dockerfiles/hhvm/changelog
index 8879107..192c08a 100644
--- a/dockerfiles/hhvm/changelog
+++ b/dockerfiles/hhvm/changelog
@@ -1,3 +1,10 @@
+hhvm (0.1.3) wikimedia; urgency=medium
+
+ * Use {{ image_tag }} filter
+ * Mark dependency via control
+
+ -- Antoine Musso <[email protected]> Thu, 21 Dec 2017 13:13:55 +0100
+
hhvm (0.1.2) wikimedia; urgency=medium
* Set environment variable HHVM_REPO_CENTRAL_PATH=/hhvm.hhbc
diff --git a/dockerfiles/hhvm/control b/dockerfiles/hhvm/control
new file mode 100644
index 0000000..6ffa818
--- /dev/null
+++ b/dockerfiles/hhvm/control
@@ -0,0 +1 @@
+Depends: ci-stretch
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 03667f2..36f1ef5 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -263,7 +263,7 @@
- '{name}-composer-package-{phpflavor}-docker': &phpflavor_docker
phpflavor:
- hhvm:
- image:
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.1.2
+ image:
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.1.3
- php55:
image:
docker-registry.wikimedia.org/releng/composer-package-php55:0.1.1
- php70:
@@ -271,7 +271,7 @@
- '{name}-composer-{phpflavor}-docker':
phpflavor:
- hhvm:
- image:
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.1.2
+ image:
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.1.3
- php55:
image:
docker-registry.wikimedia.org/releng/composer-test-php55:0.1.1
- php70:
diff --git a/jjb/php.yaml b/jjb/php.yaml
index 0eedc70..7d8ebf4 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -203,7 +203,7 @@
- 'composer-package-{phpflavor}-docker':
phpflavor:
- hhvm:
- image:
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.1.2
+ image:
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.1.3
- php55:
image:
docker-registry.wikimedia.org/releng/composer-package-php55:0.1.1
- php70:
@@ -211,7 +211,7 @@
- 'composer-{phpflavor}-docker':
phpflavor:
- hhvm:
- image:
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.1.2
+ image:
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.1.3
- php55:
image:
docker-registry.wikimedia.org/releng/composer-test-php55:0.1.1
- php70:
--
To view, visit https://gerrit.wikimedia.org/r/399612
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia3dc26910413881a3f7ead9711d85878b836f5de
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
