Compare commits

...

3 Commits
202 ... 206

Author SHA1 Message Date
Pascal Vizeli
4617de754f Bump version to 206 2020-03-01 17:31:20 +01:00
Pascal Vizeli
fb8bc0b2b7 Fix supervisor update flow with apparmor (#1551) 2020-03-01 17:27:23 +01:00
Pascal Vizeli
3b8ae878b4 Migrate build from 205 2020-03-01 17:26:29 +01:00
5 changed files with 18 additions and 8 deletions

View File

@@ -10,10 +10,8 @@ trigger:
- "*"
pr: none
variables:
- name: basePythonTag
value: "3.7-alpine3.11"
- name: versionBuilder
value: "6.9"
value: "7.0"
- group: docker
jobs:
@@ -51,6 +49,5 @@ jobs:
-v ~/.docker:/root/.docker \
-v /run/docker.sock:/run/docker.sock:rw -v $(pwd):/data:ro \
homeassistant/amd64-builder:$(versionBuilder) \
--supervisor $(basePythonTag) --version $(Build.SourceBranchName) \
--all -t /data --docker-hub homeassistant
--generic $(Build.SourceBranchName) --all -t /data
displayName: "Build Release"

13
build.json Normal file
View File

@@ -0,0 +1,13 @@
{
"image": "homeassistant/{arch}-hassio-supervisor",
"build_from": {
"aarch64": "homeassistant/aarch64-base-python:3.7-alpine3.11",
"armhf": "homeassistant/armhf-base-python:3.7-alpine3.11",
"armv7": "homeassistant/armv7-base-python:3.7-alpine3.11",
"amd64": "homeassistant/amd64-base-python:3.7-alpine3.11",
"i386": "homeassistant/i386-base-python:3.7-alpine3.11"
},
"labels": {
"io.hass.type": "supervisor"
}
}

View File

@@ -3,7 +3,7 @@ from enum import Enum
from ipaddress import ip_network
from pathlib import Path
HASSIO_VERSION = "201"
HASSIO_VERSION = "206"
URL_HASSIO_ADDONS = "https://github.com/home-assistant/hassio-addons"

View File

@@ -73,7 +73,7 @@ class AppArmorControl(CoreSysAttributes):
# Copy to AppArmor folder
dest_profile = Path(self.sys_config.path_apparmor, profile_name)
try:
shutil.copy(profile_file, dest_profile)
shutil.copyfile(profile_file, dest_profile)
except OSError as err:
_LOGGER.error("Can't copy %s: %s", profile_file, err)
raise HostAppArmorError() from None

View File

@@ -115,7 +115,7 @@ class Supervisor(CoreSysAttributes):
_LOGGER.info("Update Supervisor to version %s", version)
try:
await self.instance.update(version, latest=True)
await self.instance.install(version, image=None, latest=True)
except DockerAPIError:
_LOGGER.error("Update of Hass.io fails!")
raise SupervisorUpdateError() from None