summaryrefslogtreecommitdiffstats
path: root/lava-master/Dockerfile
diff options
context:
space:
mode:
authorkhilman <khilman@users.noreply.github.com>2018-02-02 10:24:49 -0800
committerGitHub <noreply@github.com>2018-02-02 10:24:49 -0800
commite3b883de8c99832687aeb5950f2114a992541d75 (patch)
treeb6a41fadc6f405c6517b5f87be62af98f00602cf /lava-master/Dockerfile
parent3177c39ace236c22bf7d29ebac13e0b73f4ae39f (diff)
parente93a8b174964a1cff91bfe3da8560ae3bdc41a8e (diff)
Merge pull request #15 from montjoie/lavastable
stick to 2017.11
Diffstat (limited to 'lava-master/Dockerfile')
-rw-r--r--lava-master/Dockerfile39
1 files changed, 17 insertions, 22 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index 1e396d4..0f3c14b 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -29,37 +29,32 @@ RUN wget http://images.validation.linaro.org/production-repo/production-repo.key
&& 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 service postgresql start \
- && DEBIAN_FRONTEND=noninteractive apt-get -y install \
- lava \
+RUN DEBIAN_FRONTEND=noninteractive apt-get -y install \
qemu-system \
qemu-system-arm \
qemu-system-i386 \
qemu-kvm \
ser2net \
u-boot-tools \
- python-setproctitle \
- && a2enmod proxy \
- && a2enmod proxy_http \
- && a2dissite 000-default \
- && a2ensite lava-server \
- && /stop.sh
+ python-setproctitle
-# 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 \
+#RUN service postgresql start \
+# && DEBIAN_FRONTEND=noninteractive apt-get -y install \
+# lava \
# && /stop.sh
+# Install latest
+COPY scripts/build-lava /
+RUN bash /build-lava lava-dispatcher 2017.11 2017.11.post1-1
+RUN service postgresql start && \
+ bash /build-lava lava-server 2017.11 2017.11.post1-1 && \
+ /stop.sh
+
+RUN a2enmod proxy \
+ && a2enmod proxy_http \
+ && a2dissite 000-default \
+ && a2ensite lava-server
+
COPY configs/tftpd-hpa /etc/default/tftpd-hpa
COPY health-checks/* /etc/lava-server/dispatcher-config/health-checks/