diff options
| author |   Tyler Baker <forcedinductionz@gmail.com> | 2017-10-27 21:59:34 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2017-10-27 21:59:34 -0700 |
| commit | 736fc3248108069d9f7d98fadc436aad3732dfab (patch) | |
| tree | 01c4310dd22d3ef9a3a19c719de07aecb0015778 /lava-master | |
| parent | ceb64a544ae771e2e1d1a41e46a59c6f0a9de060 (diff) | |
| parent | 09e2ea04485476093b97277cf4bf445052f4ba1b (diff) | |
Merge pull request #10 from montjoie/misc
Misc
Diffstat (limited to 'lava-master')
| -rw-r--r-- | lava-master/Dockerfile | 32 | ||||
| -rw-r--r-- | lava-master/health-checks/.empty | 0 |
2 files changed, 19 insertions, 13 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index 4fd4148..2dd44b0 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -49,29 +49,35 @@ RUN /start.sh \ && /stop.sh # Install latest -RUN /start.sh \ - && git clone https://github.com/kernelci/lava-dispatcher.git -b master /root/lava-dispatcher \ - && cd /root/lava-dispatcher \ - && git checkout release \ - && git clone -b master https://github.com/kernelci/lava-server.git /root/lava-server \ - && cd /root/lava-server \ - && git checkout release \ - && git config --global user.name "Docker Build" \ - && git config --global user.email "info@kernelci.org" \ - && echo "cd \${DIR} && dpkg -i *.deb" >> /root/lava-server/share/debian-dev-build.sh \ - && cd /root/lava-dispatcher && /root/lava-server/share/debian-dev-build.sh -p lava-dispatcher \ - && cd /root/lava-server && /root/lava-server/share/debian-dev-build.sh -p lava-server \ - && /stop.sh +#RUN /start.sh \ +# && git clone https://github.com/kernelci/lava-dispatcher.git -b master /root/lava-dispatcher \ +# && cd /root/lava-dispatcher \ +# && git checkout release \ +# && git clone -b master https://github.com/kernelci/lava-server.git /root/lava-server \ +# && cd /root/lava-server \ +# && git checkout release \ +# && git config --global user.name "Docker Build" \ +# && git config --global user.email "info@kernelci.org" \ +# && echo "cd \${DIR} && dpkg -i *.deb" >> /root/lava-server/share/debian-dev-build.sh \ +# && cd /root/lava-dispatcher && /root/lava-server/share/debian-dev-build.sh -p lava-dispatcher \ +# && cd /root/lava-server && /root/lava-server/share/debian-dev-build.sh -p lava-server \ +# && /stop.sh COPY configs/tftpd-hpa /etc/default/tftpd-hpa +COPY health-checks/* /etc/lava-server/dispatcher-config/health-checks/ + 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 +#RUN sed -i 's,^.*http_proxy:.*, http_proxy: http://squid:3128,' /etc/lava-server/env.yaml + EXPOSE 69/udp 80 3079 5555 5556 CMD /start.sh && bash diff --git a/lava-master/health-checks/.empty b/lava-master/health-checks/.empty new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/lava-master/health-checks/.empty |