diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2018-07-12 14:30:06 +0200 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2018-07-12 14:30:20 +0200 |
| commit | 32221a4e8fe36fd5c3c972039932cb53a25b1d5c (patch) | |
| tree | 5e974f9d05f18f358b437f88c2b530b47b609414 | |
| parent | 3e0ed7a2bb5f52ba54fdc1a6fbbe258f42397fbe (diff) | |
Exit if device-types patch does not apply
| -rw-r--r-- | lava-master/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
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 |