diff options
| author | Martin Roth <gaumless@gmail.com> | 2022-05-23 16:04:38 -0600 |
|---|---|---|
| committer | Paul Fagerburg <pfagerburg@chromium.org> | 2022-05-31 13:41:56 +0000 |
| commit | b3f91b79414c8ad49db80ca6b1c7036a951edfbb (patch) | |
| tree | de48f84e940f8d85652fcbda1105f8d6a9e24f59 /util | |
| parent | 5fcef01c3ff49fdbfab008b5956c29a3029175e0 (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')
| -rw-r--r-- | util/docker/coreboot-jenkins-node/Dockerfile | 13 | ||||
| -rw-r--r-- | util/docker/coreboot-sdk/Dockerfile | 1 | ||||
| -rw-r--r-- | util/docker/doc.coreboot.org/Dockerfile | 12 |
3 files changed, 18 insertions, 8 deletions
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index 526487e1a7..e11c25d86d 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile @@ -20,7 +20,6 @@ RUN chmod +x ./zephyr.run 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 @@ RUN apt-get -y update && \ ninja-build \ openssh-server \ parallel \ + ruby-full \ sdcc \ && apt-get clean @@ -77,7 +77,16 @@ RUN apt-get update && \ 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 acd82429b8..e77a8f71a8 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 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 |