diff options
| author | Nicholas Chin <nic.c3.14@gmail.com> | 2024-02-05 13:17:01 -0700 |
|---|---|---|
| committer | Martin L Roth <gaumless@gmail.com> | 2024-03-21 16:11:37 +0000 |
| commit | 9203e25a3539a3a1e55ea12b3bfa4d15f0aa0304 (patch) | |
| tree | b270fd9bbeb2840d049df261bf042f3337fe766b | |
| parent | af68bf25aa5c9305c8ba62c272fb4f6471e3fab6 (diff) | |
util/docker: Update Dockerfiles for building documentation
Update all pip packages related to coreboot's documentation to their
latest available version, and update the doc.coreboot.org base image
to Alpine 3.19.1. Add myst-parser in preparation to switch from
Recommonmark to MyST Parser.
TEST: The documentation builds and renders properly when built using
the updated container.
Change-Id: I8df4aadabc49c0201a836333745fe138184595ac
Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/80312
Reviewed-by: Martin L Roth <gaumless@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | util/docker/coreboot-jenkins-node/Dockerfile | 9 | ||||
| -rw-r--r-- | util/docker/doc.coreboot.org/Dockerfile | 13 |
2 files changed, 12 insertions, 10 deletions
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index 351cc4413a..d1a5de9a47 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile @@ -77,12 +77,13 @@ RUN echo 'export PATH=$PATH:/opt/xgcc/bin' >> /home/coreboot/.bashrc && \ pip3 install --upgrade --no-cache-dir pip && \ pip3 install --no-cache-dir \ setuptools==58.2.0 \ - jinja2==3.1.2 \ + jinja2==3.1.3 \ recommonmark===0.7.1 \ - sphinx===6.2.1 \ + myst-parser===2.0.0 \ + sphinx===7.2.6 \ sphinxcontrib-ditaa===1.0.2 \ - sphinx_autobuild===2021.3.14 \ - sphinx_rtd_theme===1.2.2 \ + sphinx_autobuild===2024.2.4 \ + sphinx_rtd_theme===2.0.0 \ && mkdir -p /home/coreboot/.ssh && \ echo "{{SSH_KEY}}" > /home/coreboot/.ssh/authorized_keys && \ chmod 0700 /home/coreboot/.ssh && \ diff --git a/util/docker/doc.coreboot.org/Dockerfile b/util/docker/doc.coreboot.org/Dockerfile index b45660de1c..d0c32c953c 100644 --- a/util/docker/doc.coreboot.org/Dockerfile +++ b/util/docker/doc.coreboot.org/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.18.3 +FROM alpine:3.19.1 COPY makeSphinx.sh /makeSphinx.sh @@ -13,12 +13,13 @@ RUN python3 -m venv $VIRTUAL_ENV && \ echo "source ${VIRTUAL_ENV}/bin/activate" >> /home/coreboot/.bashrc && \ pip3 install --upgrade --no-cache-dir pip && \ pip3 install --no-cache-dir \ - jinja2==3.1.2 \ - recommonmark===0.7.1\ - sphinx===6.2.1 \ + jinja2==3.1.3 \ + recommonmark===0.7.1 \ + myst-parser==2.0.0 \ + sphinx===7.2.6 \ sphinxcontrib-ditaa===1.0.2 \ - sphinx_autobuild===2021.3.14 \ - sphinx_rtd_theme===1.2.2 + sphinx_autobuild===2024.2.4 \ + sphinx_rtd_theme===2.0.0 ADD https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar \ /usr/lib/ditaa-0.11.0-standalone.jar |