summaryrefslogtreecommitdiffstats
path: root/lava-master
diff options
context:
space:
mode:
authorKevin Hilman <khilman@baylibre.com>2021-02-22 07:42:55 -0800
committerGitHub <noreply@github.com>2021-02-22 07:42:55 -0800
commit6786fe48f12b441766111b11045591213e9eb661 (patch)
tree4f8969fc648d0cbeab50f8acddc8c5f4fdee0bce /lava-master
parent8fa118db5f312d5b6a9ae9acbc3113423dd31f68 (diff)
parent2553013ad11ad08fbd04bb7c6a2cfc6122a5413c (diff)
Merge pull request #135 from montjoie/upgrade-to-2021.01
Upgrade to 2021.01
Diffstat (limited to 'lava-master')
-rw-r--r--lava-master/Dockerfile2
-rwxr-xr-xlava-master/entrypoint.d/01_setup.sh3
2 files changed, 4 insertions, 1 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-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