From 3abb11dab66f6e398897f0ccd908bd9e5aa5d6fb Mon Sep 17 00:00:00 2001
From: Pascal Vizeli <pascal.vizeli@syshack.ch>
Date: Wed, 29 Mar 2017 20:30:35 +0200
Subject: [PATCH] Change handling for taging

---
 hassio_api/hassio/dock/__init__.py      | 5 ++---
 hassio_api/hassio/dock/homeassistant.py | 4 ++++
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/hassio_api/hassio/dock/__init__.py b/hassio_api/hassio/dock/__init__.py
index 23502861b..c63f03cc7 100644
--- a/hassio_api/hassio/dock/__init__.py
+++ b/hassio_api/hassio/dock/__init__.py
@@ -40,10 +40,9 @@ class DockerBase(object):
         """
         try:
             _LOGGER.info("Pull image %s tag %s", self.image, tag)
-            self.dock.images.pull(self.image, tag=tag)
+            image = self.dock.images.pull(self.image, tag=tag)
 
-            if tag != "latest":
-                image = self.dock.images.get("{}:{}".format(self.image, tag))
+            if tag != 'latest':
                 image.tag(self.image, tag='latest')
         except docker.errors.APIError:
             _LOGGER.error("Can't pull %s:%s", self.image, tag)
diff --git a/hassio_api/hassio/dock/homeassistant.py b/hassio_api/hassio/dock/homeassistant.py
index c8e65227b..e383b17f2 100644
--- a/hassio_api/hassio/dock/homeassistant.py
+++ b/hassio_api/hassio/dock/homeassistant.py
@@ -5,6 +5,7 @@ import docker
 
 from . import DockerBase
 from ..const import HASSIO_DOCKER
+from ..tools import get_version_from_env
 
 _LOGGER = logging.getLogger(__name__)
 HASS_DOCKER_NAME = 'homeassistant'
@@ -51,6 +52,9 @@ class DockerHomeAssistant(DockerBase):
                     self.config.path_ssl_docker:
                         {'bind': '/ssl', 'mode': 'rw'},
                 })
+
+            self.version = get_version_from_env(
+                self.container.attrs['Config']['Env'])
         except docker.errors.DockerException:
             _LOGGER.error("Can't run %s", self.image)
             return False