summaryrefslogtreecommitdiffstats
path: root/lava-master
diff options
context:
space:
mode:
Diffstat (limited to 'lava-master')
-rw-r--r--lava-master/Dockerfile6
-rw-r--r--lava-master/env/.empty0
2 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
diff --git a/lava-master/env/.empty b/lava-master/env/.empty
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lava-master/env/.empty