summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFelix Singer <felixsinger@posteo.net>2024-10-24 16:37:26 +0200
committerFelix Singer <felixsinger@posteo.net>2024-10-26 06:38:06 +0000
commitc21bed6de9359111afd5d6ed6e76b1d2116b216c (patch)
tree945c2654b35d93c8f59ce83492f566e47d596064
parent043d9ec6936abbcaa3e2f8778d197452a86c4c51 (diff)
util/docker/doc.coreboot.org: Reformat Dockerfile
Use tabs instead of spaces and use one line per argument for better readability. Change-Id: Ic1893c3cd75f825cfddf29b53d3c5ddf8efcccc2 Signed-off-by: Felix Singer <felixsinger@posteo.net> Reviewed-on: https://review.coreboot.org/c/coreboot/+/84854 Reviewed-by: Nicholas Chin <nic.c3.14@gmail.com> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--util/docker/doc.coreboot.org/Dockerfile37
1 files changed, 25 insertions, 12 deletions
diff --git a/util/docker/doc.coreboot.org/Dockerfile b/util/docker/doc.coreboot.org/Dockerfile
index 3f28c83092..f5b36d7e57 100644
--- a/util/docker/doc.coreboot.org/Dockerfile
+++ b/util/docker/doc.coreboot.org/Dockerfile
@@ -2,23 +2,36 @@ FROM alpine:3.19.1
COPY makeSphinx.sh /makeSphinx.sh
-RUN apk add --no-cache python3 py3-pip make bash git openjdk8-jre ttf-dejavu fontconfig \
- && chmod 755 /makeSphinx.sh
+RUN \
+ apk add --no-cache \
+ python3 \
+ py3-pip \
+ make \
+ bash \
+ git \
+ openjdk8-jre \
+ ttf-dejavu \
+ fontconfig \
+ && chmod 755 /makeSphinx.sh
+
RUN adduser -D coreboot
USER coreboot
+
ENV VIRTUAL_ENV="/home/coreboot/python3"
ENV PATH=$VIRTUAL_ENV/bin:$PATH:/home/coreboot/.local/bin
-RUN python3 -m venv $VIRTUAL_ENV && \
- echo "source ${VIRTUAL_ENV}/bin/activate" >> /home/coreboot/.bashrc && \
- pip3 install --upgrade --no-cache-dir pip && \
- pip3 install --no-cache-dir \
- 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
+
+RUN \
+ python3 -m venv $VIRTUAL_ENV && \
+ echo "source ${VIRTUAL_ENV}/bin/activate" >> /home/coreboot/.bashrc && \
+ pip3 install --upgrade --no-cache-dir pip && \
+ pip3 install --no-cache-dir \
+ 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