Hashar has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404483 )
Change subject: Add PHP to doxygen image
......................................................................
Add PHP to doxygen image
Typically used for filters.
Update:
doxygen-publish
mwext-doxygen-publish
oojs-ui-doxygen-publish
Change-Id: Iedf328e8e16292e0bc22362441f46de1b66335e1
---
M dockerfiles/doxygen/Dockerfile.template
M dockerfiles/doxygen/changelog
M dockerfiles/doxygen/example-run.sh
M jjb/mediawiki-extensions.yaml
M jjb/misc.yaml
5 files changed, 12 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/integration/config
refs/changes/83/404483/1
diff --git a/dockerfiles/doxygen/Dockerfile.template
b/dockerfiles/doxygen/Dockerfile.template
index 49b7db5..9d1f21f 100644
--- a/dockerfiles/doxygen/Dockerfile.template
+++ b/dockerfiles/doxygen/Dockerfile.template
@@ -1,6 +1,7 @@
FROM {{ "ci-jessie" | image_tag }}
-RUN {{ "doxygen graphviz" | apt_install }}
+# php is for filters
+RUN {{ "doxygen graphviz php5-cli" | apt_install }}
COPY run.sh /run.sh
diff --git a/dockerfiles/doxygen/changelog b/dockerfiles/doxygen/changelog
index b461105..b36d0ed 100644
--- a/dockerfiles/doxygen/changelog
+++ b/dockerfiles/doxygen/changelog
@@ -1,3 +1,9 @@
+doxygen (0.3.0) wikimedia; urgency=medium
+
+ * Add php-cli for filters.
+
+ -- Antoine Musso <[email protected]> Tue, 16 Jan 2018 17:00:07 +0100
+
doxygen (0.2.0) wikimedia; urgency=medium
* Make the container clone the repository.
diff --git a/dockerfiles/doxygen/example-run.sh
b/dockerfiles/doxygen/example-run.sh
index 961410c..9cc2625 100755
--- a/dockerfiles/doxygen/example-run.sh
+++ b/dockerfiles/doxygen/example-run.sh
@@ -20,7 +20,7 @@
--volume /"$(pwd)"/cache://cache \
--volume /"$(pwd)"/src://src \
-e ZUUL_URL=https://gerrit.wikimedia.org/r/ \
- -e ZUUL_PROJECT=mediawiki/oauthclient-php \
+ -e ZUUL_PROJECT=oojs/ui \
-e ZUUL_REF=master \
docker-registry.wikimedia.org/releng/doxygen:latest
diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml
index 1452068..4adb81d 100644
--- a/jjb/mediawiki-extensions.yaml
+++ b/jjb/mediawiki-extensions.yaml
@@ -346,7 +346,7 @@
- docker-log-dir
- docker-src-dir
- docker-run-with-log-cache-src:
- image: docker-registry.wikimedia.org/releng/doxygen:0.2.0
+ image: docker-registry.wikimedia.org/releng/doxygen:0.3.0
logdir: '/log'
- doc-publish:
docsrc: 'src/docs/php'
diff --git a/jjb/misc.yaml b/jjb/misc.yaml
index 0a27682..c9ebdff 100644
--- a/jjb/misc.yaml
+++ b/jjb/misc.yaml
@@ -12,7 +12,7 @@
- docker-log-dir
- docker-src-dir
- docker-run-with-log-cache-src:
- image: docker-registry.wikimedia.org/releng/doxygen:0.2.0
+ image: docker-registry.wikimedia.org/releng/doxygen:0.3.0
logdir: '/log'
- doc-publish:
docsrc: 'src/doc/html'
@@ -207,7 +207,7 @@
- docker-log-dir
- docker-src-dir
- docker-run-with-log-cache-src:
- image: docker-registry.wikimedia.org/releng/doxygen:0.2.0
+ image: docker-registry.wikimedia.org/releng/doxygen:0.3.0
logdir: '/log'
- doc-publish:
docsrc: 'doc/html'
--
To view, visit https://gerrit.wikimedia.org/r/404483
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Iedf328e8e16292e0bc22362441f46de1b66335e1
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
