From 469015339e2ba948dc16777202f658d69d714343 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Thu, 26 Oct 2017 10:50:14 +0200 Subject: Forgot to comment the git install on master --- lava-master/Dockerfile | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index 4fd4148..d79b625 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -49,19 +49,19 @@ 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 -- cgit 1.2.3-korg