diff options
| author |   khilman <khilman@users.noreply.github.com> | 2018-12-03 09:06:44 -0800 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2018-12-03 09:06:44 -0800 |
| commit | 7442ca80b0f0fd125fcaf5dc34c30fd4b23341bd (patch) | |
| tree | 46b5dedce8a86ac4fb8fc45692b5b762291b29b1 | |
| parent | 21ea290d328b07cddc02c157cffd034185b98513 (diff) | |
| parent | fd12365c6767337dee68f8c003582045bcb7d1d4 (diff) | |
Merge pull request #76 from montjoie/use_pkg_lavacli
Use lavacli from package instead of from sources
| -rw-r--r-- | lava-master-base/99-stretch-backports | 4 | ||||
| -rw-r--r-- | lava-slave-base/99-stretch-backports | 4 | ||||
| -rw-r--r-- | lava-slave/Dockerfile | 4 |
3 files changed, 9 insertions, 3 deletions
diff --git a/lava-master-base/99-stretch-backports b/lava-master-base/99-stretch-backports index a513bd1..cfd4832 100644 --- a/lava-master-base/99-stretch-backports +++ b/lava-master-base/99-stretch-backports @@ -33,3 +33,7 @@ Pin-Priority: 500 Package: lava-server-doc Pin: release n=stretch-backports Pin-Priority: 500 + +Package: lavacli +Pin: release n=stretch-backports +Pin-Priority: 500 diff --git a/lava-slave-base/99-stretch-backports b/lava-slave-base/99-stretch-backports index f8c087b..652f4a0 100644 --- a/lava-slave-base/99-stretch-backports +++ b/lava-slave-base/99-stretch-backports @@ -17,3 +17,7 @@ Pin-Priority: 500 Package: lava-dispatcher Pin: release n=stretch-backports Pin-Priority: 500 + +Package: lavacli +Pin: release n=stretch-backports +Pin-Priority: 500 diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index 5ef1843..48850a8 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -30,9 +30,7 @@ RUN DEBIAN_FRONTEND=noninteractive apt-get -y install ser2net RUN rm /etc/apt/sources.list.d/sid.list RUN apt-get update -# 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 +RUN apt-get -y install lavacli COPY phyhostname /root/ COPY scripts/setup.sh . |