summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2018-03-07 10:31:40 +0100
committerCorentin LABBE <clabbe@baylibre.com>2018-03-08 20:07:14 +0100
commitc79a1c359bf42a0164f85d7e54476e7b1430b0ec (patch)
treec294a69cfd10c9cde92963e64c9ffb25217664c6
parent4bd2731463230669c7c19c0ee085f3019f3ef169 (diff)
Install qemu-kvm only on x86/x86_64
qemu-kvm is not availlable on ARM. Install it only on supported x86/x86_64
-rw-r--r--lava-master/Dockerfile3
-rw-r--r--lava-slave/Dockerfile3
2 files changed, 4 insertions, 2 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index 607a79a..a65fd9a 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -33,11 +33,12 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
qemu-system \
qemu-system-arm \
qemu-system-i386 \
- qemu-kvm \
ser2net \
u-boot-tools \
python-setproctitle
+RUN if [ "$(uname -m)" = "x86_64" -o "$(uname -m)" = "x86" ] ;then apt-get -y install qemu-kvm ; fi
+
#RUN service postgresql start \
# && DEBIAN_FRONTEND=noninteractive apt-get -y install \
# lava \
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile
index 6f2181e..b6a2cee 100644
--- a/lava-slave/Dockerfile
+++ b/lava-slave/Dockerfile
@@ -24,10 +24,11 @@ RUN \
qemu-system \
qemu-system-arm \
qemu-system-i386 \
- qemu-kvm \
xnbd-server \
e2fsprogs
+RUN if [ "$(uname -m)" = "x86_64" -o "$(uname -m)" = "x86" ] ;then apt-get -y install qemu-kvm ; fi
+
# Uncomment the following for having the latest package (you need to comment all build-lava below)
#RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget gnupg \
# && wget http://images.validation.linaro.org/production-repo/production-repo.key.asc \