diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2019-10-04 07:35:05 -0700 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2019-10-04 07:35:05 -0700 |
| commit | d7360d5899d7a4cc701634fbb6e3b6d5606dc04b (patch) | |
| tree | 02c8c3541667d7d15071ca8e8942954ddab66440 /lava-master | |
| parent | 8ebcea50e12756580560b4b6578ad3979682ea59 (diff) | |
| parent | 4760b0d2372ca68275296e86aa6cfc1f731cd543 (diff) | |
Merge pull request #104 from montjoie/2019.09
2019.09
Diffstat (limited to 'lava-master')
| -rw-r--r-- | lava-master/Dockerfile | 3 | ||||
| -rwxr-xr-x | lava-master/entrypoint.d/01_setup.sh | 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-master/entrypoint.d/01_setup.sh b/lava-master/entrypoint.d/01_setup.sh index be950b7..4755bc4 100755 --- a/lava-master/entrypoint.d/01_setup.sh +++ b/lava-master/entrypoint.d/01_setup.sh @@ -14,7 +14,7 @@ fi if [ -e /root/backup/db_lavaserver ];then echo "Restore database from backup" sudo -u postgres psql < /root/backup/db_lavaserver || exit $? - lava-server manage migrate || exit $? + yes yes | lava-server manage migrate || exit $? echo "Restore jobs output from backup" rm -r /var/lib/lava-server/default/media/job-output/* tar xzf /root/backup/joboutput.tar.gz || exit $? |