From 03bed162f4428b90ab632718c6795b0c27c0c01c Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 7 Jul 2017 00:30:04 +0200 Subject: [PATCH 1/3] Pump version to 0.42 --- hassio/const.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/hassio/const.py b/hassio/const.py index 7d58f2b62..da9ac8e93 100644 --- a/hassio/const.py +++ b/hassio/const.py @@ -1,7 +1,7 @@ """Const file for HassIO.""" from pathlib import Path -HASSIO_VERSION = '0.41' +HASSIO_VERSION = '0.42' URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/' 'hassio/master/version.json') From 6c1456902e98fe0076d9125aa1d08078d32a7e42 Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 7 Jul 2017 14:12:26 +0200 Subject: [PATCH 2/3] 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 From d31895123eaeff12c80483aa24f6e658186bcc9f Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Fri, 7 Jul 2017 14:14:55 +0200 Subject: [PATCH 3/3] Update version.json --- version.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/version.json b/version.json index ea8a7c9ba..f92c8dc76 100644 --- a/version.json +++ b/version.json @@ -1,5 +1,5 @@ { - "hassio": "0.41", + "hassio": "0.42", "homeassistant": "0.48.1", "resinos": "0.8", "resinhup": "0.1",