Hashar has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/404475 )
Change subject: Fix doxygen container not cloning repo ...................................................................... Fix doxygen container not cloning repo Update: doxygen-publish mwext-doxygen-publish oojs-ui-doxygen-publish Change-Id: I72876738d3c171b2c923da5ef6ac5d946222bb36 --- M dockerfiles/doxygen/Dockerfile.template M dockerfiles/doxygen/changelog M dockerfiles/doxygen/example-run.sh M dockerfiles/doxygen/run.sh M jjb/mediawiki-extensions.yaml M jjb/misc.yaml 6 files changed, 21 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/75/404475/1 diff --git a/dockerfiles/doxygen/Dockerfile.template b/dockerfiles/doxygen/Dockerfile.template index a7a16c1..49b7db5 100644 --- a/dockerfiles/doxygen/Dockerfile.template +++ b/dockerfiles/doxygen/Dockerfile.template @@ -4,4 +4,5 @@ COPY run.sh /run.sh +USER nobody ENTRYPOINT ["/run.sh"] diff --git a/dockerfiles/doxygen/changelog b/dockerfiles/doxygen/changelog index 78c7777..b461105 100644 --- a/dockerfiles/doxygen/changelog +++ b/dockerfiles/doxygen/changelog @@ -1,3 +1,10 @@ +doxygen (0.2.0) wikimedia; urgency=medium + + * Make the container clone the repository. + * Run entrypoint as nobody + + -- Antoine Musso <has...@free.fr> Tue, 16 Jan 2018 16:41:43 +0100 + doxygen (0.1.0) wikimedia; urgency=medium * Initial creation. Based on Jessie. diff --git a/dockerfiles/doxygen/example-run.sh b/dockerfiles/doxygen/example-run.sh index 568c0af..961410c 100755 --- a/dockerfiles/doxygen/example-run.sh +++ b/dockerfiles/doxygen/example-run.sh @@ -6,12 +6,6 @@ mkdir -m 777 -p src mkdir -m 777 -p cache -(cd src - git init - git fetch --quiet --depth 1 "https://gerrit.wikimedia.org/r/mediawiki/oauthclient-php"; - git checkout FETCH_HEAD -) - echo "Cleaning generated documentation in /src/doc" docker run \ --rm --tty \ @@ -25,6 +19,9 @@ --volume /"$(pwd)"/log://var/lib/jenkins/log \ --volume /"$(pwd)"/cache://cache \ --volume /"$(pwd)"/src://src \ + -e ZUUL_URL=https://gerrit.wikimedia.org/r/ \ + -e ZUUL_PROJECT=mediawiki/oauthclient-php \ + -e ZUUL_REF=master \ docker-registry.wikimedia.org/releng/doxygen:latest set +x diff --git a/dockerfiles/doxygen/run.sh b/dockerfiles/doxygen/run.sh index 657bc64..1515410 100755 --- a/dockerfiles/doxygen/run.sh +++ b/dockerfiles/doxygen/run.sh @@ -4,6 +4,12 @@ set -euxo pipefail -doxygen --version cd /src + +git init +git fetch --depth 2 --quiet "${ZUUL_URL}/${ZUUL_PROJECT}" "$ZUUL_REF" +git checkout --quiet FETCH_HEAD +git submodule --quiet update --init --recursive + +doxygen --version exec doxygen diff --git a/jjb/mediawiki-extensions.yaml b/jjb/mediawiki-extensions.yaml index 5d33fc3..1452068 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.1.0 + image: docker-registry.wikimedia.org/releng/doxygen:0.2.0 logdir: '/log' - doc-publish: docsrc: 'src/docs/php' diff --git a/jjb/misc.yaml b/jjb/misc.yaml index eca3d22..0a27682 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.1.0 + image: docker-registry.wikimedia.org/releng/doxygen:0.2.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.1.0 + image: docker-registry.wikimedia.org/releng/doxygen:0.2.0 logdir: '/log' - doc-publish: docsrc: 'doc/html' -- To view, visit https://gerrit.wikimedia.org/r/404475 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I72876738d3c171b2c923da5ef6ac5d946222bb36 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
