jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/403923 )
Change subject: Migrate mediawiki-phpcs to docker-pkg
......................................................................
Migrate mediawiki-phpcs to docker-pkg
Bug: T177276
Change-Id: I3dbfabe51fc7eb620e30b288dd90957e5dd4bf4f
---
D dockerfiles/mediawiki-phpcs/Dockerfile
A dockerfiles/mediawiki-phpcs/Dockerfile.template
A dockerfiles/mediawiki-phpcs/changelog
A dockerfiles/mediawiki-phpcs/control
M dockerfiles/mediawiki-phpcs/example-run.sh
M dockerfiles/mediawiki-phpcs/run.sh
M jjb/mediawiki.yaml
7 files changed, 28 insertions(+), 9 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/dockerfiles/mediawiki-phpcs/Dockerfile
b/dockerfiles/mediawiki-phpcs/Dockerfile
deleted file mode 100644
index 1af5c3e..0000000
--- a/dockerfiles/mediawiki-phpcs/Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM wmfreleng/composer:latest
-
-USER nobody
-COPY run.sh /run.sh
-ENTRYPOINT /bin/bash /run.sh
diff --git a/dockerfiles/mediawiki-phpcs/Dockerfile.template
b/dockerfiles/mediawiki-phpcs/Dockerfile.template
new file mode 100644
index 0000000..212e21d
--- /dev/null
+++ b/dockerfiles/mediawiki-phpcs/Dockerfile.template
@@ -0,0 +1,5 @@
+FROM {{ "composer" | image_tag }}
+
+USER nobody
+COPY run.sh /run.sh
+ENTRYPOINT ["/run.sh"]
diff --git a/dockerfiles/mediawiki-phpcs/changelog
b/dockerfiles/mediawiki-phpcs/changelog
new file mode 100644
index 0000000..3b2f9a5
--- /dev/null
+++ b/dockerfiles/mediawiki-phpcs/changelog
@@ -0,0 +1,7 @@
+mediawiki-phpcs (0.1.0) wikimedia; urgency=medium
+
+ * Initial port to docker-pkg
+ * Change ENTRYPOINT to exec form
+ * fix example-run.sh which was no more fetching sources
+
+ -- Antoine Musso <[email protected]> Fri, 12 Jan 2018 14:46:19 +0100
diff --git a/dockerfiles/mediawiki-phpcs/control
b/dockerfiles/mediawiki-phpcs/control
new file mode 100644
index 0000000..c626649
--- /dev/null
+++ b/dockerfiles/mediawiki-phpcs/control
@@ -0,0 +1 @@
+Depends: composer
diff --git a/dockerfiles/mediawiki-phpcs/example-run.sh
b/dockerfiles/mediawiki-phpcs/example-run.sh
index 124cccd..f11e4f8 100644
--- a/dockerfiles/mediawiki-phpcs/example-run.sh
+++ b/dockerfiles/mediawiki-phpcs/example-run.sh
@@ -1,11 +1,22 @@
#!/bin/bash
-install --mode 777 --directory log
+set -euo pipefail
+
+install --mode 777 --directory cache log src
+
docker run \
--rm --tty \
--env ZUUL_URL=https://gerrit.wikimedia.org/r \
--env ZUUL_PROJECT=mediawiki/core \
--env ZUUL_COMMIT=e447a97de58e9e2b4dd6a6e31a91edc68dde1217 \
--env ZUUL_REF=refs/changes/52/378752/2 \
- --volume /$(pwd)/log://var/lib/jenkins/log \
- wmfreleng/mediawiki-phpcs:latest
+ --volume "/$(pwd)/cache://cache" \
+ --volume "/$(pwd)/src://src" \
+ docker-registry.wikimedia.org/releng/ci-src-setup-simple:latest
+
+docker run \
+ --rm --tty \
+ --volume "/$(pwd)/cache:/cache" \
+ --volume "/$(pwd)/log://var/lib/jenkins/log" \
+ --volume "/$(pwd)/src://src" \
+ docker-registry.wikimedia.org/releng/mediawiki-phpcs:latest
diff --git a/dockerfiles/mediawiki-phpcs/run.sh
b/dockerfiles/mediawiki-phpcs/run.sh
old mode 100644
new mode 100755
diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml
index 3141446..841513b 100644
--- a/jjb/mediawiki.yaml
+++ b/jjb/mediawiki.yaml
@@ -402,7 +402,7 @@
- docker-cache-dir
- docker-ci-src-setup-simple
- docker-run-with-log-cache-src:
- image: 'wmfreleng/mediawiki-phpcs:v2017.10.28.06.43'
+ image: 'docker-registry.wikimedia.org/releng/mediawiki-phpcs:0.1.0'
logdir: '/log'
publishers:
- checkstyle:
--
To view, visit https://gerrit.wikimedia.org/r/403923
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I3dbfabe51fc7eb620e30b288dd90957e5dd4bf4f
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
