From 5cc4a9a929ce5349fb33be565f5a99ed18764a74 Mon Sep 17 00:00:00 2001 From: Stefan Agner Date: Wed, 29 Sep 2021 16:42:41 +0200 Subject: [PATCH] Use `=` instead of deprecated `:` as security option separator (#3167) Docker reports: Sep 23 08:16:31 homeassistant dockerd[467]: time="2021-09-23T08:16:31.771717436Z" level=warning msg="Security options with `:` as a separator are deprecated and will be completely unsupported in 17.04, use `=` instead." Since it seems that Docker supports `=` since quite a while, we should use `=` only. --- .github/workflows/builder.yml | 2 +- scripts/supervisor.sh | 2 +- supervisor/docker/addon.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/builder.yml b/.github/workflows/builder.yml index f788bf808..8c6dc6f5a 100644 --- a/.github/workflows/builder.yml +++ b/.github/workflows/builder.yml @@ -219,7 +219,7 @@ jobs: docker create --name hassio_supervisor \ --privileged \ --security-opt seccomp=unconfined \ - --security-opt apparmor:unconfined \ + --security-opt apparmor=unconfined \ -v /run/docker.sock:/run/docker.sock \ -v /run/dbus:/run/dbus \ -v /tmp/supervisor/data:/data \ diff --git a/scripts/supervisor.sh b/scripts/supervisor.sh index 21b0b4baa..be52fd740 100755 --- a/scripts/supervisor.sh +++ b/scripts/supervisor.sh @@ -36,7 +36,7 @@ function run_supervisor() { --name hassio_supervisor \ --privileged \ --security-opt seccomp=unconfined \ - --security-opt apparmor:unconfined \ + --security-opt apparmor=unconfined \ -v /run/docker.sock:/run/docker.sock:rw \ -v /run/dbus:/run/dbus:ro \ -v /run/udev:/run/udev:ro \ diff --git a/supervisor/docker/addon.py b/supervisor/docker/addon.py index 3aa0b566b..956a2a0c9 100644 --- a/supervisor/docker/addon.py +++ b/supervisor/docker/addon.py @@ -196,7 +196,7 @@ class DockerAddon(DockerInterface): # AppArmor apparmor = self.sys_host.apparmor.available if not apparmor or self.addon.apparmor == SECURITY_DISABLE: - security.append("apparmor:unconfined") + security.append("apparmor=unconfined") elif self.addon.apparmor == SECURITY_PROFILE: security.append(f"apparmor={self.addon.slug}")