diff options
| author | Felix Singer <felixsinger@posteo.net> | 2023-04-06 02:29:23 +0200 |
|---|---|---|
| committer | Felix Singer <service+coreboot-gerrit@felixsinger.de> | 2023-04-25 05:35:57 +0000 |
| commit | 98d7157a6dea2eb586b6b7957084b4b310e732ff (patch) | |
| tree | e84d30c31dd0ced39e9534b3cae4d13567b4239a | |
| parent | 0197ddf20a361848725efc6cff7952649906ad30 (diff) | |
util/docker/jenkins-node: Merge package installations into first step
It's not necessary to have multiple steps for installing packages and
requirements. Just merge the two install steps to one.
Change-Id: Ibe620e5b20a5f1a5d4e1c4c98942c136f450f280
Signed-off-by: Felix Singer <felixsinger@posteo.net>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/74245
Reviewed-by: Matt DeVillier <matt.devillier@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin L Roth <gaumless@gmail.com>
| -rw-r--r-- | util/docker/coreboot-jenkins-node/Dockerfile | 42 |
1 files changed, 19 insertions, 23 deletions
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile index 2fc380daab..b277efaf49 100644 --- a/util/docker/coreboot-jenkins-node/Dockerfile +++ b/util/docker/coreboot-jenkins-node/Dockerfile @@ -35,7 +35,25 @@ RUN apt-get -y update && \ parallel \ ruby-full \ sdcc \ - && apt-get clean + python3-pip \ + pykwalify \ + python3-yaml \ + python3-pyelftools \ + python3-jsonschema \ + python3-colorama \ + python3-pyrsistent \ + swig \ + && apt-get clean \ + && pip3 install --upgrade --no-cache-dir pip \ + && pip3 install --no-cache-dir \ + setuptools==58.2.0 \ + 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 # Because of the way that the variables are being replaced, docker's 'COPY' # command does not work @@ -67,28 +85,6 @@ 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 \ - swig \ - && apt-get clean \ - && pip3 install --upgrade --no-cache-dir pip \ - && pip3 install --no-cache-dir \ - setuptools==58.2.0 \ - 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 - # Build U-boot tools needed by zephyr RUN mkdir /tmp/b && cd /tmp/b && \ git clone https://git.kernel.org/pub/scm/utils/dtc/dtc.git dtc && \ |