From 31555bcb6555d080e7072fba2fc8ccda0fd59eaa Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Thu, 12 Apr 2018 11:59:07 +0200 Subject: Implement Multipleslave This patch implement multiple slave support. Instead of having a maximum of one master and one slave in one docker image, it is now possible to have multiple slave accross several docker host. For helping this change, a new boards.yaml format is introduced (See README.md for details) Note that tokens.yaml is also squashed in boards.yaml --- lava-master/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lava-master/Dockerfile') diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index a65fd9a..b475c8c 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -66,11 +66,11 @@ COPY devices/ /root/devices/ COPY device-types/ /root/device-types/ COPY users/ /root/lava-users/ COPY tokens/ /root/lava-callback-tokens/ -COPY slaves/* /etc/lava-server/dispatcher.d/ COPY scripts/setup.sh / RUN /start.sh && /setup.sh && /stop.sh #uncomment if you want to use squid +# warning the address used must be network accessible by all slave #RUN sed -i 's,^.*http_proxy:.*, http_proxy: http://squid:3128,' /etc/lava-server/env.yaml #comment this if you do HTTPS (For reenabling CSRF cookie) -- cgit 1.2.3-korg