jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399609 )
Change subject: docker: fix zuul-cloner docker-pkg definition
......................................................................
docker: fix zuul-cloner docker-pkg definition
* Use {{ image_tag }} filter
* Mark dependency via control
This way it uses the proper tag, ie in the generated Dockerfile:
- FROM docker-registry.wikimedia.org/releng/ci-jessie
+ FROM docker-registry.wikimedia.org/releng/ci-jessie:0.3.0
Change-Id: Id576044fc86da9c2cbbf6468c061f30f29475f24
---
M dockerfiles/zuul-cloner/Dockerfile.template
M dockerfiles/zuul-cloner/changelog
M dockerfiles/zuul-cloner/control
3 files changed, 9 insertions(+), 1 deletion(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, but someone else must approve
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dockerfiles/zuul-cloner/Dockerfile.template
b/dockerfiles/zuul-cloner/Dockerfile.template
index 0401a60..9a66992 100644
--- a/dockerfiles/zuul-cloner/Dockerfile.template
+++ b/dockerfiles/zuul-cloner/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM docker-registry.wikimedia.org/releng/ci-jessie:latest
+FROM {{ "ci-jessie" | image_tag }}
ARG DEBIAN_FRONTEND=noninteractive
diff --git a/dockerfiles/zuul-cloner/changelog
b/dockerfiles/zuul-cloner/changelog
index 3bbf6bd..3714932 100644
--- a/dockerfiles/zuul-cloner/changelog
+++ b/dockerfiles/zuul-cloner/changelog
@@ -1,3 +1,10 @@
+zuul-cloner (0.1.1) wikimedia; urgency=medium
+
+ * Use {{ image_tag }} filter
+ * Mark dependency via control
+
+ -- Antoine Musso <[email protected]> Thu, 21 Dec 2017 12:44:09 +0100
+
zuul-cloner (0.1.0) wikimedia; urgency=medium
* Initial conversion to docker-pkg
diff --git a/dockerfiles/zuul-cloner/control b/dockerfiles/zuul-cloner/control
index 25fa3ba..98a0521 100644
--- a/dockerfiles/zuul-cloner/control
+++ b/dockerfiles/zuul-cloner/control
@@ -1,3 +1,4 @@
Package: zuul-cloner
Description: Zuul-cloner as used on Wikimedia Jessie
Maintainer: Addshore <[email protected]>
+Depends: ci-jessie
--
To view, visit https://gerrit.wikimedia.org/r/399609
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Id576044fc86da9c2cbbf6468c061f30f29475f24
Gerrit-PatchSet: 2
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: Paladox <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
