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>
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile
index 526487e..e11c25d 100644
--- a/util/docker/coreboot-jenkins-node/Dockerfile
+++ b/util/docker/coreboot-jenkins-node/Dockerfile
@@ -20,7 +20,6 @@
RUN ./zephyr.run -- -d /opt/zephyr-sdk
FROM coreboot/coreboot-sdk:{{SDK_VERSION}}
-MAINTAINER Martin Roth <martin@coreboot.org>
USER root
RUN apt-get -y update && \
@@ -33,6 +32,7 @@
ninja-build \
openssh-server \
parallel \
+ ruby-full \
sdcc \
&& apt-get clean
@@ -77,7 +77,16 @@
python3-pyrsistent \
python3-setuptools \
swig \
- && apt-get clean
+ && apt-get clean \
+ && pip3 install --upgrade --no-cache-dir pip \
+ && pip3 install --no-cache-dir \
+ 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 \
+ && gem install mdl
RUN mkdir /tmp/b && cd /tmp/b && \
git clone https://git.kernel.org/pub/scm/utils/dtc/dtc.git dtc && \
diff --git a/util/docker/coreboot-sdk/Dockerfile b/util/docker/coreboot-sdk/Dockerfile
index acd8242..e77a8f7 100644
--- a/util/docker/coreboot-sdk/Dockerfile
+++ b/util/docker/coreboot-sdk/Dockerfile
@@ -13,7 +13,6 @@
# DOCKER_COMMIT is the coreboot Commit-ID to build the toolchain from.
FROM debian:sid AS coreboot-sdk
-MAINTAINER Martin Roth <martin@coreboot.org>
RUN \
useradd -p locked -m coreboot && \
diff --git a/util/docker/doc.coreboot.org/Dockerfile b/util/docker/doc.coreboot.org/Dockerfile
index 23f5f50..a2e8f7b 100644
--- a/util/docker/doc.coreboot.org/Dockerfile
+++ b/util/docker/doc.coreboot.org/Dockerfile
@@ -7,12 +7,14 @@
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