Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/399611 )
Change subject: docker: fix php55 definitions
......................................................................
docker: fix php55 definitions
* Use {{ image_tag }} filter
* Mark dependency via control
Update php55 jobs.
Change-Id: I0376587049146b542b52b268eabed50d7f85d5ad
---
M dockerfiles/composer-package-php55/Dockerfile.template
M dockerfiles/composer-package-php55/changelog
A dockerfiles/composer-package-php55/control
M dockerfiles/composer-php55/Dockerfile.template
M dockerfiles/composer-php55/changelog
A dockerfiles/composer-php55/control
M dockerfiles/composer-test-php55/Dockerfile.template
M dockerfiles/composer-test-php55/changelog
A dockerfiles/composer-test-php55/control
M dockerfiles/php55/Dockerfile.template
M dockerfiles/php55/changelog
A dockerfiles/php55/control
M jjb/mediawiki.yaml
M jjb/php.yaml
14 files changed, 40 insertions(+), 8 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/11/399611/1
diff --git a/dockerfiles/composer-package-php55/Dockerfile.template
b/dockerfiles/composer-package-php55/Dockerfile.template
index ccc6b47..f23c8c2 100644
--- a/dockerfiles/composer-package-php55/Dockerfile.template
+++ b/dockerfiles/composer-package-php55/Dockerfile.template
@@ -1,6 +1,6 @@
FROM wmfreleng/composer-package
-FROM docker-registry.wikimedia.org/releng/composer-php55:latest
+FROM {{ "composer-php55" | image_tag }}
USER nobody
COPY --from=wmfreleng/composer-package /run.sh /run.sh
diff --git a/dockerfiles/composer-package-php55/changelog
b/dockerfiles/composer-package-php55/changelog
index e2f1920..025bf26 100644
--- a/dockerfiles/composer-package-php55/changelog
+++ b/dockerfiles/composer-package-php55/changelog
@@ -1,3 +1,10 @@
+composer-package-php55 (0.1.1) wikimedia; urgency=medium
+
+ * Use {{ image_tag }} filter
+ * Mark dependency via control
+
+ -- Antoine Musso <[email protected]> Thu, 21 Dec 2017 13:01:50 +0100
+
composer-package-php55 (0.1.0) wikimedia; urgency=medium
* Initial creation based on wmfreleng/composer-package
diff --git a/dockerfiles/composer-package-php55/control
b/dockerfiles/composer-package-php55/control
new file mode 100644
index 0000000..03313c5
--- /dev/null
+++ b/dockerfiles/composer-package-php55/control
@@ -0,0 +1 @@
+Depends: composer-php55
diff --git a/dockerfiles/composer-php55/Dockerfile.template
b/dockerfiles/composer-php55/Dockerfile.template
index a8c12e4..8bc6496 100644
--- a/dockerfiles/composer-php55/Dockerfile.template
+++ b/dockerfiles/composer-php55/Dockerfile.template
@@ -1,6 +1,6 @@
FROM wmfreleng/composer:latest as composer
-FROM docker-registry.wikimedia.org/releng/php55:latest
+FROM {{ "php55" | image_tag }}
COPY --from=composer /srv/composer /srv/composer
COPY --from=composer /.cache-buster-composer /.cache-buster-composer
diff --git a/dockerfiles/composer-php55/changelog
b/dockerfiles/composer-php55/changelog
index 7b35c75..3dfc4bf 100644
--- a/dockerfiles/composer-php55/changelog
+++ b/dockerfiles/composer-php55/changelog
@@ -1,3 +1,10 @@
+composer-php55 (0.1.1) wikimedia; urgency=medium
+
+ * Use {{ image_tag }} filter
+ * Mark dependency via control
+
+ -- Antoine Musso <[email protected]> Thu, 21 Dec 2017 13:01:50 +0100
+
composer-php55 (0.1.0) wikimedia; urgency=medium
* Initial port to docker-pkg
diff --git a/dockerfiles/composer-php55/control
b/dockerfiles/composer-php55/control
new file mode 100644
index 0000000..9690b0b
--- /dev/null
+++ b/dockerfiles/composer-php55/control
@@ -0,0 +1 @@
+Depends: php55
diff --git a/dockerfiles/composer-test-php55/Dockerfile.template
b/dockerfiles/composer-test-php55/Dockerfile.template
index 60e36c0..d09cec3 100644
--- a/dockerfiles/composer-test-php55/Dockerfile.template
+++ b/dockerfiles/composer-test-php55/Dockerfile.template
@@ -1,6 +1,6 @@
FROM wmfreleng/composer-test
-FROM docker-registry.wikimedia.org/releng/composer-php55:latest
+FROM {{ "composer-php55" | image_tag }}
USER nobody
COPY --from=wmfreleng/composer-test /run.sh /run.sh
diff --git a/dockerfiles/composer-test-php55/changelog
b/dockerfiles/composer-test-php55/changelog
index 793aaeb..e34fb29 100644
--- a/dockerfiles/composer-test-php55/changelog
+++ b/dockerfiles/composer-test-php55/changelog
@@ -1,3 +1,10 @@
+composer-test-php55 (0.1.1) wikimedia; urgency=medium
+
+ * Use {{ image_tag }} filter
+ * Mark dependency via control
+
+ -- Antoine Musso <[email protected]> Thu, 21 Dec 2017 13:01:50 +0100
+
composer-test-php55 (0.1.0) wikimedia; urgency=medium
* Initial port from wmfreleng/composer-test
diff --git a/dockerfiles/composer-test-php55/control
b/dockerfiles/composer-test-php55/control
new file mode 100644
index 0000000..03313c5
--- /dev/null
+++ b/dockerfiles/composer-test-php55/control
@@ -0,0 +1 @@
+Depends: composer-php55
diff --git a/dockerfiles/php55/Dockerfile.template
b/dockerfiles/php55/Dockerfile.template
index d254a42..1b89252 100644
--- a/dockerfiles/php55/Dockerfile.template
+++ b/dockerfiles/php55/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM docker-registry.wikimedia.org/releng/ci-jessie:latest
+FROM {{ "ci-jessie" | image_tag }}
{% set php55_packages|replace('\n', ' ') -%}
php5.5-cli
diff --git a/dockerfiles/php55/changelog b/dockerfiles/php55/changelog
index d08f4d8..f75338f 100644
--- a/dockerfiles/php55/changelog
+++ b/dockerfiles/php55/changelog
@@ -1,3 +1,10 @@
+php55 (0.1.1) wikimedia; urgency=medium
+
+ * Use {{ image_tag }} filter
+ * Mark dependency via control
+
+ -- Antoine Musso <[email protected]> Thu, 21 Dec 2017 13:01:50 +0100
+
php55 (0.1.0) wikimedia; urgency=medium
* Initial port to docker-pkg
diff --git a/dockerfiles/php55/control b/dockerfiles/php55/control
new file mode 100644
index 0000000..8c6d9e3
--- /dev/null
+++ b/dockerfiles/php55/control
@@ -0,0 +1 @@
+Depends: ci-jessie
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index f408d26..03667f2 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -265,7 +265,7 @@
- hhvm:
image:
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.1.2
- php55:
- image:
docker-registry.wikimedia.org/releng/composer-package-php55:0.1.0
+ image:
docker-registry.wikimedia.org/releng/composer-package-php55:0.1.1
- php70:
image: wmfreleng/composer-package:v2017.10.28.07.05
- '{name}-composer-{phpflavor}-docker':
@@ -273,7 +273,7 @@
- hhvm:
image:
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.1.2
- php55:
- image:
docker-registry.wikimedia.org/releng/composer-test-php55:0.1.0
+ image:
docker-registry.wikimedia.org/releng/composer-test-php55:0.1.1
- php70:
image: wmfreleng/composer-test:v2017.10.28.06.23
- '{name}-composer-validate'
diff --git a/jjb/php.yaml b/jjb/php.yaml
index 06a1a7e..0eedc70 100644
--- a/jjb/php.yaml
+++ b/jjb/php.yaml
@@ -205,7 +205,7 @@
- hhvm:
image:
docker-registry.wikimedia.org/releng/composer-package-hhvm:0.1.2
- php55:
- image:
docker-registry.wikimedia.org/releng/composer-package-php55:0.1.0
+ image:
docker-registry.wikimedia.org/releng/composer-package-php55:0.1.1
- php70:
image: wmfreleng/composer-package:v2017.10.28.07.05
- 'composer-{phpflavor}-docker':
@@ -213,6 +213,6 @@
- hhvm:
image:
docker-registry.wikimedia.org/releng/composer-test-hhvm:0.1.2
- php55:
- image:
docker-registry.wikimedia.org/releng/composer-test-php55:0.1.0
+ image:
docker-registry.wikimedia.org/releng/composer-test-php55:0.1.1
- php70:
image: wmfreleng/composer-test:v2017.10.28.06.23
--
To view, visit https://gerrit.wikimedia.org/r/399611
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0376587049146b542b52b268eabed50d7f85d5ad
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
