Martin L Roth has submitted this change. ( https://review.coreboot.org/c/coreboot/+/80312?usp=email )
(
5 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: util/docker: Update Dockerfiles for building documentation ......................................................................
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 --- M util/docker/coreboot-jenkins-node/Dockerfile M util/docker/doc.coreboot.org/Dockerfile 2 files changed, 12 insertions(+), 10 deletions(-)
Approvals: build bot (Jenkins): Verified Martin L Roth: Looks good to me, approved
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index 351cc44..d1a5de9 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile @@ -77,12 +77,13 @@ 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 b45660d..d0c32c9 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 @@ 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... \ /usr/lib/ditaa-0.11.0-standalone.jar