diff options
| author |   Kevin Hilman <khilman@baylibre.com> | 2021-02-22 07:42:55 -0800 |
|---|---|---|
| committer |   GitHub <noreply@github.com> | 2021-02-22 07:42:55 -0800 |
| commit | 6786fe48f12b441766111b11045591213e9eb661 (patch) | |
| tree | 4f8969fc648d0cbeab50f8acddc8c5f4fdee0bce | |
| parent | 8fa118db5f312d5b6a9ae9acbc3113423dd31f68 (diff) | |
| parent | 2553013ad11ad08fbd04bb7c6a2cfc6122a5413c (diff) | |
Merge pull request #135 from montjoie/upgrade-to-2021.01
Upgrade to 2021.01
| -rw-r--r-- | lava-master/Dockerfile | 2 | ||||
| -rwxr-xr-x | lava-master/entrypoint.d/01_setup.sh | 3 | ||||
| -rw-r--r-- | lava-slave/Dockerfile | 2 |
3 files changed, 5 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-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 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 |