summaryrefslogtreecommitdiff
path: root/util/docker
diff options
context:
space:
mode:
authorNicholas Chin <nic.c3.14@gmail.com>2024-10-27 17:09:39 -0600
committerFelix Singer <service+coreboot-gerrit@felixsinger.de>2024-10-27 23:51:03 +0000
commitd95d9f8ce82988abd0dce010cbdd3c567508196f (patch)
treec3a178a7971a6334c4afd19f0f72d3af48c2eb26 /util/docker
parentb6f3ee3f8f79fc4f07515f275442128dad9d8ce9 (diff)
Documentation: Remove ditaa support
Ditaa is a utility to convert ascii block diagrams into bitmap graphics. The latest sphinx-contrib-ditaa extension has not been updated since 2022 [1] and does not declare whether it is safe for parallel reading, causing sphinx to issue a warning as we use the `-j auto` flag to parallelize the build. It doesn't seem like anyone ever used it in the docs aside from a now abandoned patch [2], so just remove it. [1] https://pypi.org/project/sphinxcontrib-ditaa/ [2] https://review.coreboot.org/c/coreboot/+/37643 Change-Id: I460ce24aab203cbb416888787fc6e2c613d306b3 Signed-off-by: Nicholas Chin <nic.c3.14@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/84887 Reviewed-by: Felix Singer <service+coreboot-gerrit@felixsinger.de> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'util/docker')
-rw-r--r--util/docker/doc.coreboot.org/Dockerfile7
-rwxr-xr-xutil/docker/doc.coreboot.org/ditaa.sh2
2 files changed, 0 insertions, 9 deletions
diff --git a/util/docker/doc.coreboot.org/Dockerfile b/util/docker/doc.coreboot.org/Dockerfile
index f5b36d7e57..fdb4bbeb5f 100644
--- a/util/docker/doc.coreboot.org/Dockerfile
+++ b/util/docker/doc.coreboot.org/Dockerfile
@@ -9,7 +9,6 @@ RUN \
make \
bash \
git \
- openjdk8-jre \
ttf-dejavu \
fontconfig \
&& chmod 755 /makeSphinx.sh
@@ -29,15 +28,9 @@ RUN \
jinja2==3.1.3 \
myst-parser==2.0.0 \
sphinx===7.2.6 \
- sphinxcontrib-ditaa===1.0.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
-
-ADD ditaa.sh /usr/bin/ditaa
-
VOLUME /data-in /data-out
# For Sphinx-autobuild
diff --git a/util/docker/doc.coreboot.org/ditaa.sh b/util/docker/doc.coreboot.org/ditaa.sh
deleted file mode 100755
index 305deefdf2..0000000000
--- a/util/docker/doc.coreboot.org/ditaa.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/usr/bin/env sh
-exec java -jar /usr/lib/ditaa-0.11.0-standalone.jar $*