sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

util/docker: Update Dockerfiles for building documentation

Browse Source 
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>
This commit is contained in:
Nicholas Chin 2024-02-05 13:17:01 -07:00 committed by Martin L Roth
parent af68bf25aa
commit 9203e25a35
2 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
util/docker/coreboot-jenkins-node/Dockerfile
View File

@ -77,12 +77,13 @@ RUN echo 'export PATH=$PATH:/opt/xgcc/bin' >> /home/coreboot/.bashrc && \
pip3 install --upgrade --no-cache-dir pip && \ pip3 install --upgrade --no-cache-dir pip && \
pip3 install --no-cache-dir \ pip3 install --no-cache-dir \
setuptools==58.2.0 \ setuptools==58.2.0 \
jinja2==3.1.2 \ jinja2==3.1.3 \
recommonmark===0.7.1 \ recommonmark===0.7.1 \
sphinx===6.2.1 \ myst-parser===2.0.0 \
sphinx===7.2.6 \
sphinxcontrib-ditaa===1.0.2 \ sphinxcontrib-ditaa===1.0.2 \
sphinx_autobuild===2021.3.14 \ sphinx_autobuild===2024.2.4 \
sphinx_rtd_theme===1.2.2 \ sphinx_rtd_theme===2.0.0 \
&& mkdir -p /home/coreboot/.ssh && \ && mkdir -p /home/coreboot/.ssh && \
echo "{{SSH_KEY}}" > /home/coreboot/.ssh/authorized_keys && \ echo "{{SSH_KEY}}" > /home/coreboot/.ssh/authorized_keys && \
chmod 0700 /home/coreboot/.ssh && \ chmod 0700 /home/coreboot/.ssh && \

13
util/docker/doc.coreboot.org/Dockerfile
View File

@ -1,4 +1,4 @@
FROM alpine:3.18.3 FROM alpine:3.19.1
COPY makeSphinx.sh /makeSphinx.sh COPY makeSphinx.sh /makeSphinx.sh
@ -13,12 +13,13 @@ RUN python3 -m venv $VIRTUAL_ENV && \
echo "source ${VIRTUAL_ENV}/bin/activate" >> /home/coreboot/.bashrc && \ echo "source ${VIRTUAL_ENV}/bin/activate" >> /home/coreboot/.bashrc && \
pip3 install --upgrade --no-cache-dir pip && \ pip3 install --upgrade --no-cache-dir pip && \
pip3 install --no-cache-dir \ pip3 install --no-cache-dir \
jinja2==3.1.2 \ jinja2==3.1.3 \
recommonmark===0.7.1\ recommonmark===0.7.1 \
sphinx===6.2.1 \ myst-parser==2.0.0 \
sphinx===7.2.6 \
sphinxcontrib-ditaa===1.0.2 \ sphinxcontrib-ditaa===1.0.2 \
sphinx_autobuild===2021.3.14 \ sphinx_autobuild===2024.2.4 \
sphinx_rtd_theme===1.2.2 sphinx_rtd_theme===2.0.0
ADD https://github.com/stathissideris/ditaa/releases/download/v0.11.0/ditaa-0.11.0-standalone.jar \ 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 /usr/lib/ditaa-0.11.0-standalone.jar