diff options
| author | Howard Butler <howard@hobu.co> | 2018-08-13 09:18:43 -0500 |
|---|---|---|
| committer | Howard Butler <howard@hobu.co> | 2018-08-13 09:18:43 -0500 |
| commit | b350004edc04349d7053d7cb289ecae825183537 (patch) | |
| tree | 39ffe07531c10d3a4cc2239b64c6d46bb4acf3b2 | |
| parent | 88c20884fd948f8bcf958fa73026ae67efc1a2f4 (diff) | |
| download | PROJ-b350004edc04349d7053d7cb289ecae825183537.tar.gz PROJ-b350004edc04349d7053d7cb289ecae825183537.zip | |
reflect new osgeo/proj-docs docker container for documentation builds
| -rwxr-xr-x | travis/build_docs.sh | 8 | ||||
| -rwxr-xr-x | 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 |