From 32221a4e8fe36fd5c3c972039932cb53a25b1d5c Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Thu, 12 Jul 2018 14:30:06 +0200 Subject: Exit if device-types patch does not apply --- lava-master/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lava-master') diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index 3e64627..7d61103 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -86,7 +86,7 @@ COPY scripts/setup.sh / COPY settings.conf /etc/lava-server/ COPY device-types-patch/ /root/device-types-patch/ -RUN cd /etc/lava-server/dispatcher-config/device-types/ && for patch in $(ls /root/device-types-patch/*patch) ; do sed -i 's,lava_scheduler_app/tests/device-types/,,' $patch && patch < $patch ; done +RUN cd /etc/lava-server/dispatcher-config/device-types/ && for patch in $(ls /root/device-types-patch/*patch) ; do sed -i 's,lava_scheduler_app/tests/device-types/,,' $patch && patch < $patch || exit $?; done COPY lava-patch/ /root/lava-patch RUN cd /usr/lib/python3/dist-packages && for patch in $(ls /root/lava-patch/*patch) ; do patch -p1 < $patch || exit $?;done -- cgit 1.2.3-korg