Merge pull request #1538 from deis/check-hostname

fix(controller): check image for hostname

Author: Xe

controller/api/tasks.py

@@ -11,6 +11,7 @@
 import threading
 
 from celery import task
+from docker.utils import utils
 from django.conf import settings
 
 
@@ -78,10 +79,12 @@ def stop_containers(containers):
 @task
 def run_command(c, command):
     release = c.release
-    version = release.version
-    image = '{}:{}/{}'.format(settings.REGISTRY_HOST,
-                              settings.REGISTRY_PORT,
-                              release.image)
+    image = release.image + ':v' + str(release.version)
+    # check for backwards compatibility
+    if not _has_hostname(image):
+        image = '{}:{}/{}'.format(settings.REGISTRY_HOST,
+                                  settings.REGISTRY_PORT,
+                                  release.image)
     try:
         # pull the image first
         rc, pull_output = c.run("docker pull {image}".format(**locals()))
@@ -95,3 +98,8 @@ def run_command(c, command):
         return c.run(command)
     finally:
         c.delete()
+
+
+def _has_hostname(image):
+    repo, tag = utils.parse_repository_tag(image)
+    return True if '/' in repo and '.' in repo.split('/')[0] else False

controller/registry/private.py

@@ -28,7 +28,7 @@ def publish_release(source, config, target):
         repo, tag = utils.parse_repository_tag(source)
         src_image = repo
         src_tag = tag if tag is not None else 'latest'
- 
+
         nameparts = repo.rsplit('/', 1)
         if len(nameparts) == 2:
             if '/' in nameparts[0]: