summaryrefslogtreecommitdiffstats
path: root/lava-master/Dockerfile
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2019-04-03 11:42:28 +0200
committerCorentin LABBE <clabbe@baylibre.com>2019-04-03 11:42:28 +0200
commit14e3c762e575d8742b39799018913e7d944111b6 (patch)
treebd12f4a94330cbd3c75faa952b687b6a10e2bc5a /lava-master/Dockerfile
parenta8bbe0d9f99824c2faff228a50a1a4830c227b9c (diff)
lava-master: fix the applying of patchs against LAVA
Lava patch which contains device-type changes are ignored since final device-types are already in /etc/lava-server/device-types/ So for fixing this, we apply lava-patch before device-type patch and synchronize them.
Diffstat (limited to 'lava-master/Dockerfile')
-rw-r--r--lava-master/Dockerfile7
1 files changed, 4 insertions, 3 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index ba9496e..f8ed805 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -20,11 +20,12 @@ 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 || exit $?; done
-
COPY lava-patch/ /root/lava-patch
RUN cd /usr/lib/python3/dist-packages && for patch in $(ls /root/lava-patch/*patch| sort) ; do echo $patch && patch -p1 < $patch || exit $?;done
+RUN rsync -avr /usr/lib/python3/dist-packages/lava_scheduler_app/tests/device-types/ /etc/lava-server/dispatcher-config/device-types/
+
+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 && echo $patch && patch < $patch || exit $?; done
COPY zmq_auth/ /etc/lava-dispatcher/certificates.d/