Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/391564 )
Change subject: Convert mediawiki-* images to docker-pkg
......................................................................
Convert mediawiki-* images to docker-pkg
Change-Id: I6be94b58509fd63eef51e29386e0bbbab1a0250b
---
R dockerfiles/mediawiki-phan/Dockerfile.template
A dockerfiles/mediawiki-phan/changelog
A dockerfiles/mediawiki-phan/control
R dockerfiles/mediawiki-phpcs/Dockerfile.template
A dockerfiles/mediawiki-phpcs/changelog
A dockerfiles/mediawiki-phpcs/control
6 files changed, 18 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/64/391564/1
diff --git a/dockerfiles/mediawiki-phan/Dockerfile
b/dockerfiles/mediawiki-phan/Dockerfile.template
similarity index 87%
rename from dockerfiles/mediawiki-phan/Dockerfile
rename to dockerfiles/mediawiki-phan/Dockerfile.template
index f4c8c8d..8422770 100644
--- a/dockerfiles/mediawiki-phan/Dockerfile
+++ b/dockerfiles/mediawiki-phan/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/composer:latest
+FROM {{ "composer" | image_tag }}
USER root
diff --git a/dockerfiles/mediawiki-phan/changelog
b/dockerfiles/mediawiki-phan/changelog
new file mode 100644
index 0000000..5b23e58
--- /dev/null
+++ b/dockerfiles/mediawiki-phan/changelog
@@ -0,0 +1,5 @@
+mediawiki-phan (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Giuseppe Lavagetto <[email protected]> Wed, 15 Nov 2017 14:17:28
+0100
diff --git a/dockerfiles/mediawiki-phan/control
b/dockerfiles/mediawiki-phan/control
new file mode 100644
index 0000000..ebb3388
--- /dev/null
+++ b/dockerfiles/mediawiki-phan/control
@@ -0,0 +1,3 @@
+Package: mediawiki-phan
+Description: Static analyzer for php applied to MediaWiki
+Depends: composer
diff --git a/dockerfiles/mediawiki-phpcs/Dockerfile
b/dockerfiles/mediawiki-phpcs/Dockerfile.template
similarity index 64%
rename from dockerfiles/mediawiki-phpcs/Dockerfile
rename to dockerfiles/mediawiki-phpcs/Dockerfile.template
index 1af5c3e..7cf2669 100644
--- a/dockerfiles/mediawiki-phpcs/Dockerfile
+++ b/dockerfiles/mediawiki-phpcs/Dockerfile.template
@@ -1,4 +1,4 @@
-FROM wmfreleng/composer:latest
+FROM {{ "composer" | image_tag }}
USER nobody
COPY run.sh /run.sh
diff --git a/dockerfiles/mediawiki-phpcs/changelog
b/dockerfiles/mediawiki-phpcs/changelog
new file mode 100644
index 0000000..2b3cbff
--- /dev/null
+++ b/dockerfiles/mediawiki-phpcs/changelog
@@ -0,0 +1,5 @@
+mediawiki-phpcs (0.1.0) wikimedia; urgency=medium
+
+ * Initial conversion to docker-pkg
+
+ -- Giuseppe Lavagetto <[email protected]> Wed, 15 Nov 2017 14:13:39
+0100
diff --git a/dockerfiles/mediawiki-phpcs/control
b/dockerfiles/mediawiki-phpcs/control
new file mode 100644
index 0000000..cd799fb
--- /dev/null
+++ b/dockerfiles/mediawiki-phpcs/control
@@ -0,0 +1,3 @@
+Package: mediawiki-phpcs
+Description: Image to run php code sniffer on the MediaWiki code base.
+Depends: composer
--
To view, visit https://gerrit.wikimedia.org/r/391564
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I6be94b58509fd63eef51e29386e0bbbab1a0250b
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
