ref(dockerclient): use docker.auth.split_repo_name instead of our own strip_prefix

Author: helgi

rootfs/registry/dockerclient.py

@@ -10,6 +10,7 @@
 
 import docker
 import docker.constants
+from docker.auth import auth
 from docker.errors import APIError
 
 logger = logging.getLogger(__name__)
@@ -37,7 +38,7 @@ def publish_release(self, source, target, deis_registry):
         name, tag = docker.utils.parse_repository_tag(target)
         # strip any "http://host.domain:port" prefix from the target repository name,
         # since we always publish to the Deis registry
-        name = strip_prefix(name)
+        repo, name = auth.split_repo_name(name)
 
         # pull the source image from the registry
         # NOTE: this relies on an implementation detail of deis-builder, that
@@ -115,11 +116,5 @@ def stream_error(chunk, operation, repo, tag):
     raise RegistryException(message)
 
 
-def strip_prefix(name):
-    """Strip the schema and host:port from a Docker repository name."""
-    paths = name.split('/')
-    return '/'.join(p for p in paths if p and '.' not in p and ':' not in p)
-
-
 def publish_release(source, target, deis_registry):
     return DockerClient().publish_release(source, target, deis_registry)

rootfs/registry/tests.py

@@ -13,7 +13,6 @@
 from django.conf import settings
 from rest_framework.exceptions import PermissionDenied
 from registry.dockerclient import DockerClient
-from registry.dockerclient import strip_prefix
 
 
 @mock.patch('docker.Client')
@@ -73,9 +72,3 @@ def test_tag(self, mock_client):
             self.client.tag('deis/controller:v1.11.1', 'deis/controller', 'v1.11.1')
         with self.assertRaises(PermissionDenied):
             self.client.tag('localhost:5000/deis/controller:v1.11.1', 'deis/controller', 'v1.11.1')
-
-    def test_strip_prefix(self, mock_client):
-        self.assertEqual(strip_prefix('quay.io/boris/riotsugar'), 'boris/riotsugar')
-        self.assertEqual(strip_prefix('127.0.0.1:5000/boris/galaxians'), 'boris/galaxians')
-        self.assertEqual(strip_prefix('boris/jacksonhead'), 'boris/jacksonhead')
-        self.assertEqual(strip_prefix(':8888/boris/pink'), 'boris/pink')