Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/403925 )
Change subject: Migrate mediawiki-phan to docker-pkg ...................................................................... Migrate mediawiki-phan to docker-pkg Bug: T177276 Change-Id: I6eb8382e2b85e189ebdabdcbe66db26f78045163 --- R dockerfiles/mediawiki-phan/Dockerfile.template M dockerfiles/mediawiki-phan/README.md A dockerfiles/mediawiki-phan/changelog A dockerfiles/mediawiki-phan/control M dockerfiles/mediawiki-phan/run.sh M jjb/mediawiki-extensions.yaml M jjb/mediawiki.yaml 7 files changed, 14 insertions(+), 8 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/25/403925/1 diff --git a/dockerfiles/mediawiki-phan/Dockerfile b/dockerfiles/mediawiki-phan/Dockerfile.template similarity index 74% rename from dockerfiles/mediawiki-phan/Dockerfile rename to dockerfiles/mediawiki-phan/Dockerfile.template index f4c8c8d..013d50f 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 @@ -13,4 +13,4 @@ rm -rf /cache/* COPY run.sh /run.sh -ENTRYPOINT ["/bin/bash", "/run.sh"] +ENTRYPOINT ["/run.sh"] diff --git a/dockerfiles/mediawiki-phan/README.md b/dockerfiles/mediawiki-phan/README.md index 66c0588..b2a5430 100644 --- a/dockerfiles/mediawiki-phan/README.md +++ b/dockerfiles/mediawiki-phan/README.md @@ -11,7 +11,7 @@ ``` docker run --rm \ --v /dev/git/gerrit/mediawiki:/mediawiki \ -wmfreleng/mediawiki-phan:latest \ -/mediawiki/extensions/ElectronPdfService -m checkstyle -``` \ No newline at end of file + -v /dev/git/gerrit/mediawiki:/mediawiki \ + docker-registry.wikimedia.org/releng/mediawiki-phan:latest \ + /mediawiki/extensions/ElectronPdfService -m checkstyle +``` diff --git a/dockerfiles/mediawiki-phan/changelog b/dockerfiles/mediawiki-phan/changelog new file mode 100644 index 0000000..36f2904 --- /dev/null +++ b/dockerfiles/mediawiki-phan/changelog @@ -0,0 +1,5 @@ +mediawiki-phan (0.1.0) wikimedia; urgency=medium + + * Initial port to docker-pkg. + + -- Antoine Musso <has...@free.fr> Fri, 12 Jan 2018 15:33:29 +0100 diff --git a/dockerfiles/mediawiki-phan/control b/dockerfiles/mediawiki-phan/control new file mode 100644 index 0000000..c626649 --- /dev/null +++ b/dockerfiles/mediawiki-phan/control @@ -0,0 +1 @@ +Depends: composer diff --git a/dockerfiles/mediawiki-phan/run.sh b/dockerfiles/mediawiki-phan/run.sh old mode 100644 new mode 100755 diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 7f8e025..eb21d51 100644 --- a/jjb/mediawiki-extensions.yaml +++ b/jjb/mediawiki-extensions.yaml @@ -370,7 +370,7 @@ exec docker run \ --rm \ --volume "$(pwd)"/src:/mediawiki \ - wmfreleng/mediawiki-phan:v2017.10.16.20.38 \ + docker-registry.wikimedia.org/releng/mediawiki-phan:0.1.0 \ /$ZUUL_PROJECT -m checkstyle # nothing else can be executed due to exec diff --git a/jjb/mediawiki.yaml b/jjb/mediawiki.yaml index 841513b..b3ce739 100644 --- a/jjb/mediawiki.yaml +++ b/jjb/mediawiki.yaml @@ -443,7 +443,7 @@ exec docker run \ --rm \ --volume "$(pwd)"/src:/mediawiki \ - wmfreleng/mediawiki-phan:v2017.10.16.20.38 \ + docker-registry.wikimedia.org/releng/mediawiki-phan:0.1.0 \ -m checkstyle # nothing else can be executed due to exec -- To view, visit https://gerrit.wikimedia.org/r/403925 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I6eb8382e2b85e189ebdabdcbe66db26f78045163 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Hashar <has...@free.fr> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits