summaryrefslogtreecommitdiff
path: root/util/docker
diff options
context:
space:
mode:
authorPatrick Georgi <pgeorgi@google.com>2020-05-26 18:18:43 +0200
committerPatrick Georgi <pgeorgi@google.com>2020-05-28 05:41:30 +0000
commit02a1344921a6cd848fe4f766e64e602632435ea8 (patch)
tree58bb596e2e7e81515a4e1ace1b1dfde8b1e9a7f6 /util/docker
parent0018d0f0de6517c0182137eff97ad96335bd69a8 (diff)
downloadcoreboot-02a1344921a6cd848fe4f766e64e602632435ea8.tar.xz
docker/coreboot-jenkins-node: Add meson and ninja
Our jenkins instance is also used for flashrom, which can be built with meson, a mode that we want to be able to test, so add that. ninja can be used as a backend to both meson and cmake (which coreboot will use to build cmocka for its unit tests) and may provide some additional coverage. Plus it's tiny but fast. Change-Id: If454164852303144eaa72c4071c03ee89e863318 Signed-off-by: Patrick Georgi <pgeorgi@google.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/41731 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Diffstat (limited to 'util/docker')
-rw-r--r--util/docker/coreboot-jenkins-node/Dockerfile1
1 files changed, 1 insertions, 0 deletions
diff --git a/util/docker/coreboot-jenkins-node/Dockerfile b/util/docker/coreboot-jenkins-node/Dockerfile
index 73f7f1829d..554ebd2654 100644
--- a/util/docker/coreboot-jenkins-node/Dockerfile
+++ b/util/docker/coreboot-jenkins-node/Dockerfile
@@ -19,6 +19,7 @@ USER root
RUN apt-get -y update && \
apt-get -y install \
+ meson ninja-build \
lua5.3 liblua5.3-dev default-jre-headless openssh-server && \
apt-get clean