Build docs in Docker and CI.

5 files changed, 25 insertions, 4 deletions

diff --git a/.builds/debian-10-with-site-packages.yml b/.builds/debian-10-with-site-packages.yml
index 1f672a6b..c1454630 100644
--- a/.builds/debian-10-with-site-packages.yml
+++ b/.builds/debian-10-with-site-packages.yml
@@ -63,3 +63,7 @@ tasks:
 
       # Run the tests, explicitly listing out skipped tests.
       ./bin/python -m pytest -rs ./mediagoblin/tests --boxed
+
+      # Build the documentation.
+      cd docs && make html
+
diff --git a/.builds/fedora-33-with-site-packages.yml b/.builds/fedora-33-with-site-packages.yml
index 0a0fce34..1e9b9c71 100644
--- a/.builds/fedora-33-with-site-packages.yml
+++ b/.builds/fedora-33-with-site-packages.yml
@@ -65,3 +65,6 @@ tasks:
 
       # Run the tests, explicitly listing out skipped tests.
       ./bin/python -m pytest -rs ./mediagoblin/tests --boxed
+
+      # Build the documentation.
+      cd docs && make html
diff --git a/Dockerfile-debian-10-sqlite b/Dockerfile-debian-10-sqlite
index 7899731f..8a409093 100644
--- a/Dockerfile-debian-10-sqlite
+++ b/Dockerfile-debian-10-sqlite
@@ -12,13 +12,13 @@
 #
 # To build this Docker image, run:
 #
-#   docker build -t mediagoblin-python3 - < Dockerfile-debian-python3-sqlite
+#   docker build -t mediagoblin - < Dockerfile-debian-10-sqlite
 #
 # The "- < Dockerfile" format advises Docker not to include the current
 # directory as build context. Alternatively the following provides build
 # context:
 #
-#   docker build -t mediagoblin-python3 -f Dockerfile-debian-python3-sqlite .
+#   docker build -t mediagoblin -f Dockerfile-debian-10-sqlite .
 #
 # Before running the image you first need to first assign the "mediagoblin" and
 # "user_dev" directories to an artificial group (1024) on the host that is
@@ -30,7 +30,7 @@
 #
 # Then you can run the image with the upstream MediaGoblin code:
 #
-#   docker run --interactive --tty --publish 6543:6543 mediagoblin-python3
+#   docker run --interactive --tty --publish 6543:6543 mediagoblin
 #
 # Or you can run with your local "mediagoblin" and "user_dev" directories
 # bind-mounted into the container. This provides automatic code reloading and
@@ -175,6 +175,9 @@ RUN ./bin/pip install py3exiv2
 # Run the tests.
 RUN ./bin/python -m pytest -rs ./mediagoblin/tests --boxed
 
+# Build the documentation.
+RUN cd docs && make html
+
 # Only safe if being run on a clean git checkout. Otherwise you may have already
 # customised mediagoblin.ini to already install these.
 RUN echo '[[mediagoblin.media_types.audio]]' >> mediagoblin.ini
diff --git a/Dockerfile-debian-11-sqlite b/Dockerfile-debian-11-sqlite
index 34f46a68..e7a5fb06 100644
--- a/Dockerfile-debian-11-sqlite
+++ b/Dockerfile-debian-11-sqlite
@@ -26,6 +26,7 @@ virtualenv
 # compatible version of billiard.
 RUN apt-get install -y \
 python3-alembic \
+python3-feedgenerator \
 python3-jsonschema \
 python3-kombu \
 python3-lxml \
@@ -35,9 +36,14 @@ python3-pytest \
 python3-pytest-xdist \
 python3-snowballstemmer \
 python3-sphinx \
+python3-sphinxcontrib.devhelp \
+python3-sphinxcontrib.qthelp \
 python3-sphinxcontrib.websupport \
 python3-webtest
 
+# Additional Sphinx dependencies not in Debian.
+RUN ./bin/pip install sphinxcontrib-applehelp sphinxcontrib-htmlhelp sphinxcontrib-jsmath
+
 # Install audio dependencies.
 RUN apt-get install -y \
 gstreamer1.0-libav \
@@ -130,7 +136,10 @@ RUN make
 RUN ./bin/pip install py3exiv2
 
 # Run the tests.
-# RUN ./bin/python -m pytest -rs ./mediagoblin/tests --boxed
+RUN ./bin/python -m pytest -rs ./mediagoblin/tests --boxed
+
+# Build the documentation.
+RUN cd docs && make html
 
 # Only safe if being run on a clean git checkout. Otherwise you may have already
 # customised mediagoblin.ini to already install these.
diff --git a/Dockerfile-fedora-33-sqlite b/Dockerfile-fedora-33-sqlite
index c45bb7f5..4da3a226 100644
--- a/Dockerfile-fedora-33-sqlite
+++ b/Dockerfile-fedora-33-sqlite
@@ -91,6 +91,8 @@ RUN make
 
 RUN ./bin/python -m pytest -rs ./mediagoblin/tests --boxed
 
+RUN cd docs && make html
+
 RUN echo '[[mediagoblin.media_types.audio]]' >> mediagoblin.ini
 RUN echo '[[mediagoblin.media_types.video]]' >> mediagoblin.ini