summaryrefslogtreecommitdiff
path: root/util/docker/doc.coreboot.org/Dockerfile
diff options
context:
space:
mode:
authorMartin Roth <gaumless@gmail.com>2022-05-23 16:04:38 -0600
committerPaul Fagerburg <pfagerburg@chromium.org>2022-05-31 13:41:56 +0000
commitb3f91b79414c8ad49db80ca6b1c7036a951edfbb (patch)
treede48f84e940f8d85652fcbda1105f8d6a9e24f59 /util/docker/doc.coreboot.org/Dockerfile
parent5fcef01c3ff49fdbfab008b5956c29a3029175e0 (diff)
util/docker: Update dockerfiles
- Remove deprecated "MAINTAINER" lines - Add Sphinx tools to coreboot-jenkins-node to check documentation. - Add mdl to check markdown - Alphabetize packages in docs Dockerfile - Add jinja2 version 3.0.3 to the docs Dockerfile - The latest version breaks with the error: "exception: cannot import name 'contextfunction' from 'jinja2'" Signed-off-by: Martin Roth <gaumless@gmail.com> Change-Id: Ia1de62621a6aef4ecd055a1a3afbebad34448002 Reviewed-on: https://review.coreboot.org/c/coreboot/+/64655 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Felix Singer <felixsinger@posteo.net>
Diffstat (limited to 'util/docker/doc.coreboot.org/Dockerfile')
-rw-r--r--util/docker/doc.coreboot.org/Dockerfile12
1 files changed, 7 insertions, 5 deletions
diff --git a/util/docker/doc.coreboot.org/Dockerfile b/util/docker/doc.coreboot.org/Dockerfile
index 23f5f50403..a2e8f7b299 100644
--- a/util/docker/doc.coreboot.org/Dockerfile
+++ b/util/docker/doc.coreboot.org/Dockerfile
@@ -7,12 +7,14 @@ ADD https://sourceforge.net/projects/ditaa/files/ditaa/0.9/ditaa0_9.zip/download
RUN apk add --no-cache python3 make bash git openjdk8-jre ttf-dejavu fontconfig \
&& pip3 install --upgrade --no-cache-dir pip \
&& pip3 install --no-cache-dir \
- sphinx===1.8.3 \
- sphinx_rtd_theme===0.4.2 \
- recommonmark===0.5.0 \
- sphinx_autobuild===0.7.1 \
- sphinxcontrib-ditaa===0.6 \
+ jinja2==3.0.3 \
+ recommonmark===0.5.0 \
+ sphinx===1.8.3 \
+ sphinxcontrib-ditaa===0.6 \
+ sphinx_autobuild===0.7.1 \
+ sphinx_rtd_theme===0.4.2 \
&& chmod 755 /makeSphinx.sh
+
RUN cd /tmp \
&& unzip ditaa.zip \
&& mv ditaa0_9.jar /usr/lib