From b350004edc04349d7053d7cb289ecae825183537 Mon Sep 17 00:00:00 2001 From: Howard Butler Date: Mon, 13 Aug 2018 09:18:43 -0500 Subject: reflect new osgeo/proj-docs docker container for documentation builds --- travis/build_docs.sh | 8 ++++---- travis/docker.sh | 8 +++++--- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/travis/build_docs.sh b/travis/build_docs.sh index 570b03c7..ae67adf6 100755 --- a/travis/build_docs.sh +++ b/travis/build_docs.sh @@ -2,10 +2,10 @@ cd docs echo "building docs for $TRAVIS_BUILD_DIR/docs" -docker run -v $TRAVIS_BUILD_DIR:/data -w /data/docs osgeo/proj.4 make html +docker run -v $TRAVIS_BUILD_DIR:/data -w /data/docs osgeo/proj-docs make html # workaround for issue with sphinxcontrib-bibtex -docker run -v $TRAVIS_BUILD_DIR:/data -w /data/docs osgeo/proj.4 touch source/references.rst -docker run -v $TRAVIS_BUILD_DIR:/data -w /data/docs osgeo/proj.4 make html -docker run -v $TRAVIS_BUILD_DIR:/data -w /data/docs osgeo/proj.4 make latexpdf +docker run -v $TRAVIS_BUILD_DIR:/data -w /data/docs osgeo/proj-docs touch source/references.rst +docker run -v $TRAVIS_BUILD_DIR:/data -w /data/docs osgeo/proj-docs make html +docker run -v $TRAVIS_BUILD_DIR:/data -w /data/docs osgeo/proj-docs make latexpdf diff --git a/travis/docker.sh b/travis/docker.sh index aef7f2d2..c5928d9c 100755 --- a/travis/docker.sh +++ b/travis/docker.sh @@ -1,8 +1,10 @@ #!/bin/bash -# proj.4 image has all of the Sphinx -# dependencies need to build proj.4's docs +# proj-docs image has all of the Sphinx +# dependencies need to build PROJ's docs +# it is build from docker/docbuild/Dockerfile +# and is manually pushed as needed to DockerHub -docker pull osgeo/proj.4 +docker pull osgeo/proj-docs -- cgit v1.2.3