jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-17 14:16:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Improve local build / allow cache on dev (#2810)

Browse Source
This commit is contained in:
Pascal Vizeli 2021-04-15 08:19:58 +02:00 committed by GitHub
parent 8f22316869
commit e27337da85
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
supervisor/addons/build.py
View File

@ -9,6 +9,7 @@ from awesomeversion import AwesomeVersion
from ..const import ( from ..const import (
ATTR_ARGS, ATTR_ARGS,
ATTR_BUILD_FROM, ATTR_BUILD_FROM,
ATTR_LABELS,
ATTR_SQUASH, ATTR_SQUASH,
FILE_SUFFIX_CONFIGURATION, FILE_SUFFIX_CONFIGURATION,
META_ADDON, META_ADDON,
@ -46,9 +47,12 @@ class AddonBuild(FileConfiguration, CoreSysAttributes):
@property @property
def base_image(self) -> str: def base_image(self) -> str:
"""Return base image for this add-on.""" """Return base image for this add-on."""
return self._data[ATTR_BUILD_FROM].get( if not self._data[ATTR_BUILD_FROM]:
self.sys_arch.default, f"homeassistant/{self.sys_arch.default}-base:latest" return f"homeassistant/{self.sys_arch.default}-base:latest"
)
# Evaluate correct base image
arch = self.sys_arch.match(list(self._data[ATTR_BUILD_FROM].keys()))
return self._data[ATTR_BUILD_FROM][arch]
@property @property
def squash(self) -> bool: def squash(self) -> bool:
@ -60,6 +64,11 @@ class AddonBuild(FileConfiguration, CoreSysAttributes):
"""Return additional Docker build arguments.""" """Return additional Docker build arguments."""
return self._data[ATTR_ARGS] return self._data[ATTR_ARGS]
@property
def additional_labels(self) -> Dict[str, str]:
"""Return additional Docker labels."""
return self._data[ATTR_LABELS]
@property @property
def is_valid(self) -> bool: def is_valid(self) -> bool:
"""Return true if the build env is valid.""" """Return true if the build env is valid."""
@ -76,7 +85,7 @@ class AddonBuild(FileConfiguration, CoreSysAttributes):
"path": str(self.addon.path_location), "path": str(self.addon.path_location),
"tag": f"{self.addon.image}:{version!s}", "tag": f"{self.addon.image}:{version!s}",
"pull": True, "pull": True,
"forcerm": True, "forcerm": not self.sys_dev,
"squash": self.squash, "squash": self.squash,
"labels": { "labels": {
"io.hass.version": version, "io.hass.version": version,
@ -84,6 +93,7 @@ class AddonBuild(FileConfiguration, CoreSysAttributes):
"io.hass.type": META_ADDON, "io.hass.type": META_ADDON,
"io.hass.name": self._fix_label("name"), "io.hass.name": self._fix_label("name"),
"io.hass.description": self._fix_label("description"), "io.hass.description": self._fix_label("description"),
**self.additional_labels,
}, },
"buildargs": { "buildargs": {
"BUILD_FROM": self.base_image, "BUILD_FROM": self.base_image,

6
supervisor/addons/validate.py
View File

@ -47,6 +47,7 @@ from ..const import (
ATTR_INIT, ATTR_INIT,
ATTR_JOURNALD, ATTR_JOURNALD,
ATTR_KERNEL_MODULES, ATTR_KERNEL_MODULES,
ATTR_LABELS,
ATTR_LEGACY, ATTR_LEGACY,
ATTR_LOCATON, ATTR_LOCATON,
ATTR_MACHINE, ATTR_MACHINE,
@ -317,9 +318,8 @@ SCHEMA_BUILD_CONFIG = vol.Schema(
{vol.In(ARCH_ALL): vol.Match(RE_DOCKER_IMAGE_BUILD)} {vol.In(ARCH_ALL): vol.Match(RE_DOCKER_IMAGE_BUILD)}
), ),
vol.Optional(ATTR_SQUASH, default=False): vol.Boolean(), vol.Optional(ATTR_SQUASH, default=False): vol.Boolean(),
vol.Optional(ATTR_ARGS, default=dict): vol.Schema( vol.Optional(ATTR_ARGS, default=dict): vol.Schema({str: str}),
{vol.Coerce(str): vol.Coerce(str)} vol.Optional(ATTR_LABELS, default=dict): vol.Schema({str: str}),
),
}, },
extra=vol.REMOVE_EXTRA, extra=vol.REMOVE_EXTRA,
) )

1
supervisor/const.py
View File

@ -102,6 +102,7 @@ ATTR_APPARMOR = "apparmor"
ATTR_APPLICATION = "application" ATTR_APPLICATION = "application"
ATTR_ARCH = "arch" ATTR_ARCH = "arch"
ATTR_ARGS = "args" ATTR_ARGS = "args"
ATTR_LABELS = "labels"
ATTR_AUDIO = "audio" ATTR_AUDIO = "audio"
ATTR_AUDIO_INPUT = "audio_input" ATTR_AUDIO_INPUT = "audio_input"
ATTR_AUDIO_OUTPUT = "audio_output" ATTR_AUDIO_OUTPUT = "audio_output"