diff options
author | Corentin LABBE <clabbe@baylibre.com> | 2018-01-09 12:07:54 +0100 |
---|---|---|
committer | Corentin LABBE <clabbe@baylibre.com> | 2018-02-02 14:20:54 +0100 |
commit | e93a8b174964a1cff91bfe3da8560ae3bdc41a8e (patch) | |
tree | b6a41fadc6f405c6517b5f87be62af98f00602cf /lava-slave | |
parent | 01f55d2fd3ea0e9620bb631dd91e475444393099 (diff) |
stick to LAVA 2017.11
Since LAVA packages are ephemeral, this patch permit to build a know release of LAVA.
Introducing scripts/build-lava which builds from source any LAVA
compoments from any version tag.
In the same time, stick to 2017.11 as its a know working release for
lava-docker.
Diffstat (limited to 'lava-slave')
-rw-r--r-- | lava-slave/Dockerfile | 28 |
1 files changed, 9 insertions, 19 deletions
diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index fcaa0cc..8f7ba82 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -13,9 +13,6 @@ RUN \ echo 'locales locales/default_environment_locale select en_US.UTF-8' | debconf-set-selections && \ DEBIAN_FRONTEND=noninteractive apt-get -y install \ locales \ - lava-dispatcher \ - lava-dev \ - git \ vim \ sudo \ cu \ @@ -31,23 +28,16 @@ RUN \ xnbd-server \ e2fsprogs -RUN wget http://images.validation.linaro.org/production-repo/production-repo.key.asc \ - && apt-key add production-repo.key.asc \ - && echo 'deb http://images.validation.linaro.org/production-repo/ stretch-backports main' > /etc/apt/sources.list.d/lava.list \ - && apt-get clean && apt-get update +# Uncomment the following for having the latest package (you need to comment all build-lava below) +#RUN DEBIAN_FRONTEND=noninteractive apt-get -y install wget gnupg \ +# && wget http://images.validation.linaro.org/production-repo/production-repo.key.asc \ +# && apt-key add production-repo.key.asc \ +# && echo 'deb http://images.validation.linaro.org/production-repo/ stretch-backports main' > /etc/apt/sources.list.d/lava.list \ +# && apt-get clean && apt-get update +#RUN DEBIAN_FRONTEND=noninteractive apt-get -y install lava-dispatcher -RUN DEBIAN_FRONTEND=noninteractive apt-get -y install lava-dispatcher - -#RUN \ -# git clone https://github.com/kernelci/lava-server.git -b release /root/lava-server && \ -# git clone https://github.com/kernelci/lava-dispatcher.git -b master /root/lava-dispatcher && \ -# cd /root/lava-dispatcher && \ -# 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 && \ -# sleep 2 && \ -# /root/lava-server/share/debian-dev-build.sh -p lava-dispatcher +COPY scripts/build-lava / +RUN sh /build-lava lava-dispatcher 2017.11 2017.11.post1-1 COPY configs/lava-slave /etc/lava-dispatcher/lava-slave |