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>
This commit is contained in:
parent
c8a1195b77
commit
1fcf78cc8e
|
@ -25,12 +25,16 @@ USER root
|
||||||
|
|
||||||
RUN apt-get -y update && \
|
RUN apt-get -y update && \
|
||||||
apt-get -y install \
|
apt-get -y install \
|
||||||
parallel \
|
default-jre-headless \
|
||||||
meson ninja-build \
|
liblua5.3-dev \
|
||||||
sdcc \
|
|
||||||
linkchecker \
|
linkchecker \
|
||||||
lua5.3 liblua5.3-dev default-jre-headless openssh-server && \
|
lua5.3 \
|
||||||
apt-get clean
|
meson \
|
||||||
|
ninja-build \
|
||||||
|
openssh-server \
|
||||||
|
parallel \
|
||||||
|
sdcc \
|
||||||
|
&& apt-get clean
|
||||||
|
|
||||||
# Because of the way that the variables are being replaced, docker's 'COPY'
|
# Because of the way that the variables are being replaced, docker's 'COPY'
|
||||||
# command does not work
|
# 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
|
COPY --from=zephyr-sdk /opt/zephyr-sdk /opt/zephyr-sdk
|
||||||
|
|
||||||
RUN apt-get update && \
|
RUN apt-get update && \
|
||||||
apt-get install -y python3-pip pykwalify python3-yaml \
|
apt-get install -y \
|
||||||
python3-pyelftools python3-jsonschema python3-colorama \
|
python3-pip \
|
||||||
python3-pyrsistent python3-setuptools swig && \
|
pykwalify \
|
||||||
apt-get clean
|
python3-yaml \
|
||||||
|
python3-pyelftools \
|
||||||
|
python3-jsonschema \
|
||||||
|
python3-colorama \
|
||||||
|
python3-pyrsistent \
|
||||||
|
python3-setuptools \
|
||||||
|
swig \
|
||||||
|
&& apt-get clean
|
||||||
|
|
||||||
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 && \
|
||||||
|
|
Loading…
Reference in New Issue