From ef15b67571892c4b8daaec28d129ca3ddb5e4f82 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 8 Apr 2020 14:44:10 +0200 Subject: [PATCH 1/5] Bump version to 216 --- supervisor/const.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supervisor/const.py b/supervisor/const.py index 5b92de955..8bdb7b1b1 100644 --- a/supervisor/const.py +++ b/supervisor/const.py @@ -3,7 +3,7 @@ from enum import Enum from ipaddress import ip_network from pathlib import Path -SUPERVISOR_VERSION = "215" +SUPERVISOR_VERSION = "216" URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons" From 27a770bd1dca7a9609c1c87c1d15da1e0aaa3cfd Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 8 Apr 2020 23:39:18 +0200 Subject: [PATCH 2/5] force dns plugin v7 --- supervisor/plugins/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supervisor/plugins/__init__.py b/supervisor/plugins/__init__.py index 79b91338b..5cd2055e1 100644 --- a/supervisor/plugins/__init__.py +++ b/supervisor/plugins/__init__.py @@ -16,7 +16,7 @@ class PluginManager(CoreSysAttributes): """Manage supported function for plugins.""" required_cli: int = 25 - required_dns: int = 6 + required_dns: int = 7 required_audio: int = 14 required_multicast: int = 2 From 6f235c2a11d8f222ecd1a6c6448daa4be1412c1e Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Thu, 9 Apr 2020 16:45:10 +0200 Subject: [PATCH 3/5] force dns plugin v9 --- supervisor/plugins/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supervisor/plugins/__init__.py b/supervisor/plugins/__init__.py index 5cd2055e1..674a3eef9 100644 --- a/supervisor/plugins/__init__.py +++ b/supervisor/plugins/__init__.py @@ -16,7 +16,7 @@ class PluginManager(CoreSysAttributes): """Manage supported function for plugins.""" required_cli: int = 25 - required_dns: int = 7 + required_dns: int = 9 required_audio: int = 14 required_multicast: int = 2 From 216565affb3d2605c508bf664b4d52314c1be79e Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 10 Apr 2020 01:15:47 +0200 Subject: [PATCH 4/5] Give a bit more time to update apparmor (#1647) --- supervisor/supervisor.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/supervisor/supervisor.py b/supervisor/supervisor.py index 59f5ca426..02a9667ac 100644 --- a/supervisor/supervisor.py +++ b/supervisor/supervisor.py @@ -124,7 +124,7 @@ class Supervisor(CoreSysAttributes): with suppress(SupervisorError): await self.update_apparmor() - self.sys_loop.call_later(1, self.sys_loop.stop) + self.sys_loop.call_later(5, self.sys_loop.stop) @property def in_progress(self) -> bool: From f77b479e457c85926c50133b80a02902bfcdc00c Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 10 Apr 2020 23:31:24 +0200 Subject: [PATCH 5/5] Add timeout for clean shutdown (#1650) * Fix overlay * Update Dockerfile --- Dockerfile | 30 ++++++++++++++++++------------ 1 file changed, 18 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 91329f10e..10afdd765 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,29 @@ ARG BUILD_FROM FROM $BUILD_FROM +ENV \ + S6_SERVICES_GRACETIME=10000 + # Install base -RUN apk add --no-cache \ - eudev \ - eudev-libs \ - git \ - glib \ - libffi \ - libpulse \ - musl \ - openssl \ - socat +RUN \ + apk add --no-cache \ + eudev \ + eudev-libs \ + git \ + glib \ + libffi \ + libpulse \ + musl \ + openssl \ + socat ARG BUILD_ARCH WORKDIR /usr/src # Install requirements COPY requirements.txt . -RUN export MAKEFLAGS="-j$(nproc)" \ +RUN \ + export MAKEFLAGS="-j$(nproc)" \ && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links \ "https://wheels.home-assistant.io/alpine-$(cut -d '.' -f 1-2 < /etc/alpine-release)/${BUILD_ARCH}/" \ -r ./requirements.txt \ @@ -26,7 +31,8 @@ RUN export MAKEFLAGS="-j$(nproc)" \ # Install Home Assistant Supervisor COPY . supervisor -RUN pip3 install --no-cache-dir -e ./supervisor \ +RUN \ + pip3 install --no-cache-dir -e ./supervisor \ && python3 -m compileall ./supervisor/supervisor