jeans/supervisor
jeans/supervisor
1
0
Fork 0
mirror of https://github.com/home-assistant/supervisor.git synced 2025-07-26 02:26:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #93 from home-assistant/dev

Browse Source 
* Pump version to 0.42

* Update util.py (#92)

Add an optional extended description…

* Update version.json
This commit is contained in:
Pascal Vizeli 2017-07-07 14:21:01 +02:00 committed by GitHub
commit 7e5b2673dc
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hassio/const.py
View File

@ -1,7 +1,7 @@
"""Const file for HassIO.""" """Const file for HassIO."""
from pathlib import Path from pathlib import Path
HASSIO_VERSION = '0.41' HASSIO_VERSION = '0.42'
URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/' URL_HASSIO_VERSION = ('https://raw.githubusercontent.com/home-assistant/'
'hassio/master/version.json') 'hassio/master/version.json')

8
hassio/dock/util.py
View File

@ -4,7 +4,7 @@ import re
from ..const import ARCH_AARCH64, ARCH_ARMHF, ARCH_I386, ARCH_AMD64 from ..const import ARCH_AARCH64, ARCH_ARMHF, ARCH_I386, ARCH_AMD64
RESIN_BASE_IMAGE = { HASSIO_BASE_IMAGE = {
ARCH_ARMHF: "homeassistant/armhf-base:latest", ARCH_ARMHF: "homeassistant/armhf-base:latest",
ARCH_AARCH64: "homeassistant/aarch64-base:latest", ARCH_AARCH64: "homeassistant/aarch64-base:latest",
ARCH_I386: "homeassistant/i386-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): def dockerfile_template(dockerfile, arch, version, meta_type):
"""Prepare a Hass.IO dockerfile.""" """Prepare a Hass.IO dockerfile."""
buff = [] buff = []
resin_image = RESIN_BASE_IMAGE[arch] hassio_image = HASSIO_BASE_IMAGE[arch]
custom_image = re.compile(r"^#{}:FROM".format(arch))
# read docker # read docker
with dockerfile.open('r') as dock_input: with dockerfile.open('r') as dock_input:
for line in 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) buff.append(line)
# add metadata # add metadata

2
version.json
View File

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