summaryrefslogtreecommitdiff
path: root/util/docker/coreboot-jenkins-node
diff options
context:
space:
mode:
authorMartin Roth <martin@coreboot.org>2022-02-28 15:20:10 -0700
committerFelix Held <felix-coreboot@felixheld.de>2022-03-02 13:09:55 +0000
commit1fcf78cc8eff90881d5d03e38408d584f66a5035 (patch)
treefd54af9cf410f3c6f11c083c0e7c21ac98218ba5 /util/docker/coreboot-jenkins-node
parentc8a1195b7706ae73a59e5e4afc326f38e3bd93da (diff)
util/docker/coreboot-jenkins-node: Alphabetize installed tools
It's easier to read and to add new packages when each package is on its own line and they're sorted alphabetically. Indenting them also makes it easier to see what's getting installed and what's a command. Signed-off-by: Martin Roth <martin@coreboot.org> Change-Id: Ibfe297bd408ed0783fcff09c1ecb5672fe785c48 Reviewed-on: https://review.coreboot.org/c/coreboot/+/62446 Reviewed-by: Felix Singer <felixsinger@posteo.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'util/docker/coreboot-jenkins-node')
-rw-r--r--util/docker/coreboot-jenkins-node/Dockerfile31
1 files changed, 21 insertions, 10 deletions
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile
index 292616398f..526487e1a7 100644
--- a/util/docker/coreboot-jenkins-node/Dockerfile
+++ b/util/docker/coreboot-jenkins-node/Dockerfile
@@ -25,12 +25,16 @@ USER root
RUN apt-get -y update && \
apt-get -y install \
- parallel \
- meson ninja-build \
- sdcc \
- linkchecker \
- lua5.3 liblua5.3-dev default-jre-headless openssh-server && \
- apt-get clean
+ default-jre-headless \
+ liblua5.3-dev \
+ linkchecker \
+ lua5.3 \
+ meson \
+ ninja-build \
+ openssh-server \
+ parallel \
+ sdcc \
+ && apt-get clean
# Because of the way that the variables are being replaced, docker's 'COPY'
# command does not work
@@ -63,10 +67,17 @@ RUN gcc -o /usr/sbin/encapsulate /tmp/encapsulate.c && \
COPY --from=zephyr-sdk /opt/zephyr-sdk /opt/zephyr-sdk
RUN apt-get update && \
- apt-get install -y python3-pip pykwalify python3-yaml \
- python3-pyelftools python3-jsonschema python3-colorama \
- python3-pyrsistent python3-setuptools swig && \
- apt-get clean
+ apt-get install -y \
+ python3-pip \
+ pykwalify \
+ python3-yaml \
+ python3-pyelftools \
+ python3-jsonschema \
+ python3-colorama \
+ python3-pyrsistent \
+ python3-setuptools \
+ swig \
+ && apt-get clean
RUN mkdir /tmp/b && cd /tmp/b && \
git clone https://git.kernel.org/pub/scm/utils/dtc/dtc.git dtc && \