diff options
| author |   khilman <khilman@users.noreply.github.com> | 2018-11-02 08:51:18 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-11-02 08:51:18 -0700 |
| commit | 79fb2bd4abcee9964ca7d74da041650faaba3511 (patch) | |
| tree | 92848b04fd2ab13b13579afd25d4ef9be43b0dd9 /lava-master | |
| parent | 4cc99509aae4b37f077dee15b8878cd5e52dbcd6 (diff) | |
| parent | 11552973aa27342aa132e289debd0f01d835b5f5 (diff) | |
Merge pull request #56 from montjoie/proxy
Allow seeting ENV variables from YAML config.
Diffstat (limited to 'lava-master')
| -rw-r--r-- | lava-master/Dockerfile | 6 | ||||
| -rw-r--r-- | lava-master/env/.empty | 0 |
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 |