summaryrefslogtreecommitdiffstats
path: root/lava-slave/Dockerfile
diff options
context:
space:
mode:
Diffstat (limited to 'lava-slave/Dockerfile')
-rw-r--r--lava-slave/Dockerfile11
1 files changed, 6 insertions, 5 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile
index 6f2181e..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 && \
@@ -24,10 +20,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 \
@@ -56,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