aboutsummaryrefslogtreecommitdiffstats
path: root/lava-master/Dockerfile
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2018-10-25 15:15:29 +0200
committerCorentin LABBE <clabbe@baylibre.com>2018-11-02 16:47:06 +0100
commit5957ee693f8cc7b07613da6c2c7da576d7039e2f (patch)
tree95fe8c83df554b506a4d78dd85074b10b8acaa22 /lava-master/Dockerfile
parent4cc99509aae4b37f077dee15b8878cd5e52dbcd6 (diff)
lavalab-gen.py: permit to set env settings on slave
This patch permits to add some env settings on slave. The primary goal of this is to permits to add a proxy for a specific slave.
Diffstat (limited to 'lava-master/Dockerfile')
-rw-r--r--lava-master/Dockerfile6
1 files changed, 2 insertions, 4 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index 668c41f..fb28bc9 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -16,10 +16,6 @@ COPY groups/ /root/lava-groups/
COPY tokens/ /root/lava-callback-tokens/
COPY scripts/setup.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
-
COPY settings.conf /etc/lava-server/
COPY device-types-patch/ /root/device-types-patch/
@@ -32,6 +28,8 @@ COPY zmq_auth/ /etc/lava-dispatcher/certificates.d/
COPY lava_http_fqdn /root/
+COPY env/ /etc/lava-server/dispatcher.d/
+
EXPOSE 69/udp 80 3079 5555 5556
CMD /start.sh && while [ true ];do sleep 365d; done