Merge pull request #93 from home-assistant/dev

* Pump version to 0.42

* Update util.py (#92)

Add an optional extended description…

* Update version.json

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')

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

version.json

@@ -1,5 +1,5 @@
 {
-    "hassio": "0.41",
+    "hassio": "0.42",
     "homeassistant": "0.48.1",
     "resinos": "0.8",
     "resinhup": "0.1",