summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorentin LABBE <clabbe@baylibre.com>2018-07-04 14:25:35 +0200
committerCorentin LABBE <clabbe@baylibre.com>2018-07-12 14:30:20 +0200
commita86807eafd93f0f53933929f616ee3a73d807d7c (patch)
tree98f1012be23ceb893ca09513f8b1a7946c1a0e55
parent8089b148751def1a6eef60f79c6ea46902aeb6c4 (diff)
Permit to have backported LAVA patch
If backporting LAVA patch is necessary, this patch add an easy way to do it.
-rw-r--r--README.md3
-rw-r--r--lava-master/Dockerfile3
-rw-r--r--lava-master/lava-patch/.empty0
3 files changed, 6 insertions, 0 deletions
diff --git a/README.md b/README.md
index c48f43e..279fe25 100644
--- a/README.md
+++ b/README.md
@@ -318,6 +318,9 @@ A squid docker is provided for caching all LAVA downloads (image, dtb, rootfs, e
You have to uncomment a line in lava-master/Dockerfile to enable it.<br/>
For the moment, it is unsupported and unbuilded.
+## Backporting LAVA patches
+All upstream LAVA patches could be backported by placing them in lava-master/lava-patch/
+
## Security
Note that this container provides defaults which are unsecure. If you plan on deploying this in a production enviroment please consider the following items:
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile
index 0489858..4407f0b 100644
--- a/lava-master/Dockerfile
+++ b/lava-master/Dockerfile
@@ -89,6 +89,9 @@ 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
+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
+
EXPOSE 69/udp 80 3079 5555 5556
CMD /start.sh && while [ true ];do sleep 365d; done
diff --git a/lava-master/lava-patch/.empty b/lava-master/lava-patch/.empty
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/lava-master/lava-patch/.empty