diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2019-03-19 09:57:29 +0100 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2019-03-19 09:57:29 +0100 |
| commit | 8d0512681e342e2781282169928b617ab58ed01e (patch) | |
| tree | 8fce2a232be1ad38d9a02e80ab8bec6ab6ada512 /lava-master | |
| parent | a2ca551b15f506fa418f63cf9002524ab4937f40 (diff) | |
lava-master: handle order of LAVA patchs
The current way to add patchs is non-determinist and could lead to
failure to build.
This patch made the order determinist by using sort
Diffstat (limited to 'lava-master')
| -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 5d2a119..54a922d 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -24,7 +24,7 @@ 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 || 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 +RUN cd /usr/lib/python3/dist-packages && for patch in $(ls /root/lava-patch/*patch| sort) ; do echo $patch && patch -p1 < $patch || exit $?;done COPY zmq_auth/ /etc/lava-dispatcher/certificates.d/ |