From 63d82ce03eb009269c7ee45ae623a1b18fd62c43 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Mon, 18 Dec 2017 10:30:31 +0100 Subject: [PATCH] better merge base image (#280) * better merge base image * fix lint * fix lint * Update build.py * fix lint --- hassio/addons/build.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/hassio/addons/build.py b/hassio/addons/build.py index 0e9f3c930..cad11ad39 100644 --- a/hassio/addons/build.py +++ b/hassio/addons/build.py @@ -1,7 +1,7 @@ """HassIO addons build environment.""" 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 ..tools import JsonConfig @@ -24,7 +24,8 @@ class AddonBuild(JsonConfig): @property def base_image(self): """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 def squash(self):