From b2de2b9347e0e7f31be336d865263524c86c71b3 Mon Sep 17 00:00:00 2001
From: Corentin LABBE <clabbe@baylibre.com>
Date: Mon, 8 Jan 2018 14:22:28 +0100
Subject: Fix libguestfs on slave

Libguestfs actions are done by the dispatcher, so the slave must be able
to do them.
In the same time, add a TODO for setting volumes as read_only.
---
 docker-compose.template | 6 +++++-
 lava-master/Dockerfile  | 2 ++
 lava-slave/Dockerfile   | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/docker-compose.template b/docker-compose.template
index 21f9231..b88ed85 100644
--- a/docker-compose.template
+++ b/docker-compose.template
@@ -14,7 +14,7 @@ services:
       - "5555:5555"
       - "5556:5556"
     volumes:
-# boot and /lib/modules are for libguestfs
+# boot and /lib/modules are for libguestfs (TODO set them read_only with docker-compose 3.0)
       - "/boot:/boot"
       - "/lib/modules:/lib/modules"
   lava-slave:
@@ -29,6 +29,10 @@ services:
       - "69:69/udp"
       - "80:80"
       - "61950-62000:61950-62000"
+    volumes:
+# boot and /lib/modules are for libguestfs (TODO set them read_only with docker-compose 3.0)
+      - "/boot:/boot"
+      - "/lib/modules:/lib/modules"
     links:
       - "lava-master"
   squid:
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index 4705e45..be8a3b7 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -13,12 +13,14 @@ RUN echo 'lava-server   lava-server/instance-name string lava-docker-instance' |
  && echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_US.UTF-8 UTF-8 ' | debconf-set-selections \
  && echo 'locales locales/default_environment_locale select en_US.UTF-8' | debconf-set-selections
 
+# e2fsprogs is for libguestfs
 RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
  locales \
  postgresql \
  screen \
  sudo \
  wget \
+ e2fsprogs \
  gnupg \
  vim
 
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile
index d2f3191..fcaa0cc 100644
--- a/lava-slave/Dockerfile
+++ b/lava-slave/Dockerfile
@@ -6,6 +6,7 @@ RUN apt-get update
 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 && \
  echo 'locales locales/locales_to_be_generated multiselect C.UTF-8 UTF-8, en_US.UTF-8 UTF-8 ' | debconf-set-selections && \
-- 
cgit 1.2.3-korg