From c79a1c359bf42a0164f85d7e54476e7b1430b0ec Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Wed, 7 Mar 2018 10:31:40 +0100 Subject: Install qemu-kvm only on x86/x86_64 qemu-kvm is not availlable on ARM. Install it only on supported x86/x86_64 --- lava-slave/Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'lava-slave/Dockerfile') 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 \ -- cgit 1.2.3-korg From 0276f97db590c8187dc6b8df21c6bb06ca53100f Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Wed, 7 Mar 2018 10:38:33 +0100 Subject: Move copy of helper scripts Since nothing depends on them, copy them at last step. This prevents rebuild of all docker steps when changing them. --- lava-slave/Dockerfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'lava-slave/Dockerfile') diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index b6a2cee..b5e6385 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -2,10 +2,6 @@ FROM bitnami/minideb:stretch RUN apt-get update -# Add services helper utilities to start and stop LAVA -COPY scripts/stop.sh . -COPY scripts/start.sh . - # e2fsprogs is for libguestfs RUN \ echo 'lava-server lava-server/instance-name string lava-slave-instance' | debconf-set-selections && \ @@ -57,6 +53,10 @@ RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive apt-get -y install cu RUN rm /etc/apt/sources.list.d/testing.list +# Add services helper utilities to start and stop LAVA +COPY scripts/stop.sh . +COPY scripts/start.sh . + EXPOSE 69/udp 80 CMD /start.sh -- cgit 1.2.3-korg