diff options
| author |   khilman <khilman@users.noreply.github.com> | 2018-06-05 11:47:07 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-06-05 11:47:07 -0700 |
| commit | c1071d0f9b57958b22546abe8eadf670b3926b98 (patch) | |
| tree | 6ac6947fc9196283ecba0c17a9033d3af3aaaa99 /lava-slave/Dockerfile | |
| parent | 2d79d03f5818c096535c9784b12df5ea99c0dbff (diff) | |
| parent | a22e4a89a06bda681ba329bf73e05a7d9196efe3 (diff) | |
Merge pull request #27 from montjoie/multi_slave_2018_x
Multi slave 2018 x
Diffstat (limited to 'lava-slave/Dockerfile')
| -rw-r--r-- | lava-slave/Dockerfile | 29 |
1 files changed, 25 insertions, 4 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index b5e6385..b7252ef 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -34,18 +34,18 @@ RUN if [ "$(uname -m)" = "x86_64" -o "$(uname -m)" = "x86" ] ;then apt-get -y in #RUN DEBIAN_FRONTEND=noninteractive apt-get -y install lava-dispatcher COPY scripts/build-lava / -RUN sh /build-lava lava-dispatcher 2017.11 2017.11.post1-1 +RUN sh /build-lava lava-dispatcher 2018.4 2018.4-1 COPY configs/lava-slave /etc/lava-dispatcher/lava-slave COPY configs/tftpd-hpa /etc/default/tftpd-hpa COPY scripts/cu-loop /usr/local/bin/ -COPY conmux/* /etc/conmux/ +COPY conmux/ /etc/conmux/ # Caution to not use any port between the Linux dynamic port range: 32768-60999 -RUN sed -i 's,XNBD_PORT_RANGE_MIN.*,XNBD_PORT_RANGE_MIN=61950,' /usr/lib/python2.7/dist-packages/lava_dispatcher/utils/constants.py -RUN sed -i 's,XNBD_PORT_RANGE_MAX.*,XNBD_PORT_RANGE_MAX=62000,' /usr/lib/python2.7/dist-packages/lava_dispatcher/utils/constants.py +RUN sed -i 's,XNBD_PORT_RANGE_MIN.*,XNBD_PORT_RANGE_MIN=61950,' /usr/lib/python3/dist-packages/lava_dispatcher/utils/constants.py +RUN sed -i 's,XNBD_PORT_RANGE_MAX.*,XNBD_PORT_RANGE_MAX=62000,' /usr/lib/python3/dist-packages/lava_dispatcher/utils/constants.py #conmux need cu >= 1.07-24 See https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=336996 RUN echo "deb http://debian.proxad.net/debian/ testing main" >> /etc/apt/sources.list.d/testing.list @@ -53,10 +53,31 @@ RUN apt-get update RUN DEBIAN_FRONTEND=noninteractive apt-get -y install cu RUN rm /etc/apt/sources.list.d/testing.list +COPY scripts/lava-slave /etc/init.d/ +RUN chmod 755 /etc/init.d/lava-slave + # Add services helper utilities to start and stop LAVA COPY scripts/stop.sh . COPY scripts/start.sh . +# lava-cli dependencies +RUN apt-get -y install python3-setuptools python3-dev python3-zmq +RUN git clone https://git.linaro.org/lava/lavacli.git /root/lavacli && cd /root/lavacli && git checkout v0.7 && python3 setup.py install + +COPY phyhostname /root/ +COPY scripts/setup.sh . + +COPY scripts/setdispatcherip.py /usr/local/bin/ +RUN chmod 755 /usr/local/bin/setdispatcherip.py + +COPY scripts/retire.sh /usr/local/bin/ +RUN chmod 755 /usr/local/bin/retire.sh + +COPY devices/ /root/devices/ + +COPY scripts/extra_actions /root/ +RUN if [ -x /root/extra_actions ] ; then /root/extra_actions ; fi + EXPOSE 69/udp 80 CMD /start.sh |