From 6c1456902e98fe0076d9125aa1d08078d32a7e42 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 7 Jul 2017 14:12:26 +0200 Subject: [PATCH] Update util.py (#92) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Add an optional extended description… --- hassio/dock/util.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/hassio/dock/util.py b/hassio/dock/util.py index 87cd76020..fa46db88f 100644 --- a/hassio/dock/util.py +++ b/hassio/dock/util.py @@ -4,7 +4,7 @@ import re from ..const import ARCH_AARCH64, ARCH_ARMHF, ARCH_I386, ARCH_AMD64 -RESIN_BASE_IMAGE = { +HASSIO_BASE_IMAGE = { ARCH_ARMHF: "homeassistant/armhf-base:latest", ARCH_AARCH64: "homeassistant/aarch64-base:latest", ARCH_I386: "homeassistant/i386-base:latest", @@ -17,12 +17,14 @@ TMPL_IMAGE = re.compile(r"%%BASE_IMAGE%%") def dockerfile_template(dockerfile, arch, version, meta_type): """Prepare a Hass.IO dockerfile.""" buff = [] - resin_image = RESIN_BASE_IMAGE[arch] + hassio_image = HASSIO_BASE_IMAGE[arch] + custom_image = re.compile(r"^#{}:FROM".format(arch)) # read docker with dockerfile.open('r') as dock_input: for line in dock_input: - line = TMPL_IMAGE.sub(resin_image, line) + line = TMPL_IMAGE.sub(hassio_image, line) + line = custom_image.sub("FROM", line) buff.append(line) # add metadata