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>
This commit is contained in:
parent
5fcef01c3f
commit
b3f91b7941
|
@ -20,7 +20,6 @@ RUN chmod +x ./zephyr.run
|
||||||
RUN ./zephyr.run -- -d /opt/zephyr-sdk
|
RUN ./zephyr.run -- -d /opt/zephyr-sdk
|
||||||
|
|
||||||
FROM coreboot/coreboot-sdk:{{SDK_VERSION}}
|
FROM coreboot/coreboot-sdk:{{SDK_VERSION}}
|
||||||
MAINTAINER Martin Roth <martin@coreboot.org>
|
|
||||||
USER root
|
USER root
|
||||||
|
|
||||||
RUN apt-get -y update && \
|
RUN apt-get -y update && \
|
||||||
|
@ -33,6 +32,7 @@ RUN apt-get -y update && \
|
||||||
ninja-build \
|
ninja-build \
|
||||||
openssh-server \
|
openssh-server \
|
||||||
parallel \
|
parallel \
|
||||||
|
ruby-full \
|
||||||
sdcc \
|
sdcc \
|
||||||
&& apt-get clean
|
&& apt-get clean
|
||||||
|
|
||||||
|
@ -77,7 +77,16 @@ RUN apt-get update && \
|
||||||
python3-pyrsistent \
|
python3-pyrsistent \
|
||||||
python3-setuptools \
|
python3-setuptools \
|
||||||
swig \
|
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 && \
|
RUN mkdir /tmp/b && cd /tmp/b && \
|
||||||
git clone https://git.kernel.org/pub/scm/utils/dtc/dtc.git dtc && \
|
git clone https://git.kernel.org/pub/scm/utils/dtc/dtc.git dtc && \
|
||||||
|
|
|
@ -13,7 +13,6 @@
|
||||||
# DOCKER_COMMIT is the coreboot Commit-ID to build the toolchain from.
|
# DOCKER_COMMIT is the coreboot Commit-ID to build the toolchain from.
|
||||||
|
|
||||||
FROM debian:sid AS coreboot-sdk
|
FROM debian:sid AS coreboot-sdk
|
||||||
MAINTAINER Martin Roth <martin@coreboot.org>
|
|
||||||
|
|
||||||
RUN \
|
RUN \
|
||||||
useradd -p locked -m coreboot && \
|
useradd -p locked -m coreboot && \
|
||||||
|
|
|
@ -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 \
|
RUN apk add --no-cache python3 make bash git openjdk8-jre ttf-dejavu fontconfig \
|
||||||
&& pip3 install --upgrade --no-cache-dir pip \
|
&& pip3 install --upgrade --no-cache-dir pip \
|
||||||
&& pip3 install --no-cache-dir \
|
&& pip3 install --no-cache-dir \
|
||||||
sphinx===1.8.3 \
|
jinja2==3.0.3 \
|
||||||
sphinx_rtd_theme===0.4.2 \
|
|
||||||
recommonmark===0.5.0 \
|
recommonmark===0.5.0 \
|
||||||
sphinx_autobuild===0.7.1 \
|
sphinx===1.8.3 \
|
||||||
sphinxcontrib-ditaa===0.6 \
|
sphinxcontrib-ditaa===0.6 \
|
||||||
|
sphinx_autobuild===0.7.1 \
|
||||||
|
sphinx_rtd_theme===0.4.2 \
|
||||||
&& chmod 755 /makeSphinx.sh
|
&& chmod 755 /makeSphinx.sh
|
||||||
|
|
||||||
RUN cd /tmp \
|
RUN cd /tmp \
|
||||||
&& unzip ditaa.zip \
|
&& unzip ditaa.zip \
|
||||||
&& mv ditaa0_9.jar /usr/lib
|
&& mv ditaa0_9.jar /usr/lib
|
||||||
|
|
Loading…
Reference in New Issue