better merge base image (#280)

* better merge base image

* fix lint

* fix lint

* Update build.py

* fix lint
This commit is contained in:
Pascal Vizeli 2017-12-18 10:30:31 +01:00 committed by GitHub
parent 13a2c1ecd9
commit 63d82ce03e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -1,7 +1,7 @@
"""HassIO addons build environment.""" """HassIO addons build environment."""
from pathlib import Path from pathlib import Path
from .validate import SCHEMA_BUILD_CONFIG from .validate import SCHEMA_BUILD_CONFIG, BASE_IMAGE
from ..const import ATTR_SQUASH, ATTR_BUILD_FROM, ATTR_ARGS, META_ADDON from ..const import ATTR_SQUASH, ATTR_BUILD_FROM, ATTR_ARGS, META_ADDON
from ..tools import JsonConfig from ..tools import JsonConfig
@ -24,7 +24,8 @@ class AddonBuild(JsonConfig):
@property @property
def base_image(self): def base_image(self):
"""Base images for this addon.""" """Base images for this addon."""
return self._data[ATTR_BUILD_FROM][self.config.arch] return self._data[ATTR_BUILD_FROM].get(
self.config.arch, BASE_IMAGE[self.config.arch])
@property @property
def squash(self): def squash(self):