From 8ef5855e819fe1c581ec3d7fbb43181de44c0817 Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Tue, 9 Feb 2021 09:22:07 +0000 Subject: Upgrade to 2021.01 --- lava-master/Dockerfile | 2 +- lava-slave/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lava-master/Dockerfile b/lava-master/Dockerfile index 92025e6..8a3def4 100644 --- a/lava-master/Dockerfile +++ b/lava-master/Dockerfile @@ -1,4 +1,4 @@ -FROM lavasoftware/lava-server:2020.07 +FROM lavasoftware/lava-server:2021.01 RUN apt-get update && apt-get -y install sudo lava-coordinator git diff --git a/lava-slave/Dockerfile b/lava-slave/Dockerfile index 8412fcf..b87130e 100644 --- a/lava-slave/Dockerfile +++ b/lava-slave/Dockerfile @@ -1,4 +1,4 @@ -FROM lavasoftware/lava-dispatcher:2020.07 +FROM lavasoftware/lava-dispatcher:2021.01 RUN apt-get update -- cgit From 2553013ad11ad08fbd04bb7c6a2cfc6122a5413c Mon Sep 17 00:00:00 2001 From: Corentin LABBE Date: Wed, 10 Feb 2021 09:04:24 +0000 Subject: Fix rigths on /etc/lava-server/dispatcher-config When using persistent /etc/lava-server, a device-type could be copied without proper rights. But the fix of rights is done during docker build and at that time, volume are not setup, so not fixed. So the rigths fix need to be done at run time. --- lava-master/entrypoint.d/01_setup.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lava-master/entrypoint.d/01_setup.sh b/lava-master/entrypoint.d/01_setup.sh index e3619f7..ad84072 100755 --- a/lava-master/entrypoint.d/01_setup.sh +++ b/lava-master/entrypoint.d/01_setup.sh @@ -217,4 +217,7 @@ if [ -e /etc/lava-dispatcher/certificates.d/$(hostname).key ];then sed -i 's,.*ENCRYPT=.*,ENCRYPT="--encrypt",' /etc/lava-server/lava-logs || exit $? sed -i 's,.*MASTER_CERT=.*,MASTER_CERT="--master-cert /etc/lava-dispatcher/certificates.d/$(hostname).key_secret",' /etc/lava-server/lava-logs || exit $? fi + +echo "DEBUG: fix owning rights on /etc/lava-server/dispatcher-config" +chown -Rc lavaserver:lavaserver /etc/lava-server/dispatcher-config exit 0 -- cgit