diff options
| author |   Corentin LABBE <clabbe@baylibre.com> | 2019-09-24 14:08:07 +0200 |
|---|---|---|
| committer | Corentin LABBE <clabbe@baylibre.com> | 2019-09-27 09:28:59 +0200 |
| commit | ff52436c8920d3e7477a0757eda5b4d4923997e5 (patch) | |
| tree | f45e7a672abed2057578319d7c664d98f9bfcc3f | |
| parent | 8ebcea50e12756580560b4b6578ad3979682ea59 (diff) | |
Upgrade to 2019.09
| -rw-r--r-- | lava-master/Dockerfile | 3 | ||||
| -rw-r--r-- | lava-slave/Dockerfile | 2 |
2 files changed, 2 insertions, 3 deletions
diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index 625ebf1..76c3425 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -1,4 +1,4 @@ -FROM lavasoftware/lava-server:2019.07 +FROM lavasoftware/lava-server:2019.09 RUN apt-get update && apt-get -y install sudo lava-coordinator git @@ -23,7 +23,6 @@ COPY settings.conf /etc/lava-server/ 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 diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index b93e310..a2ce4b3 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -1,4 +1,4 @@ -FROM lavasoftware/lava-dispatcher:2019.07 +FROM lavasoftware/lava-dispatcher:2019.09 RUN apt-get update |