Merge pull request #912 from kmala/bug

fix(registry): User should be able to pull the image from internal registry

Author: kmala

rootfs/api/models/release.py

@@ -54,9 +54,7 @@ def image(self):
             self.build.image.startswith(settings.REGISTRY_HOST) or
             self.build.image.startswith(settings.REGISTRY_URL)
         ):
-            # strip registry information off first
-            image = self.build.image.replace('{}/'.format(settings.REGISTRY_URL), '')
-            return image.replace('{}/'.format(settings.REGISTRY_HOST), '')
+            return self.build.image
 
         # Sort out image information based on build type
         if self.build.type == 'dockerfile':

rootfs/api/tests/deployments/test_build.py

@@ -350,8 +350,7 @@ def test_build_image_in_registry(self, mock_requests):
 
         build = Build.objects.get(uuid=response.data['uuid'])
         release = build.app.release_set.latest()
-        # Registry host is internally stripped off
-        self.assertEqual(release.image, 'autotest/example')
+        self.assertEqual(release.image, image)
 
         # post an image as a build using registry hostname + port
         url = "/v2/apps/test/builds".format(**locals())
@@ -362,8 +361,7 @@ def test_build_image_in_registry(self, mock_requests):
 
         build = Build.objects.get(uuid=response.data['uuid'])
         release = build.app.release_set.latest()
-        # Registry host + port is internally stripped off
-        self.assertEqual(release.image, 'autotest/example')
+        self.assertEqual(release.image, image)
 
     def test_build_image_in_registry_with_auth(self, mock_requests):
         """add authentication to the build"""

rootfs/api/tests/test_build.py

@@ -346,8 +346,7 @@ def test_build_image_in_registry(self, mock_requests):
 
         build = Build.objects.get(uuid=response.data['uuid'])
         release = build.app.release_set.latest()
-        # Registry host is internally stripped off
-        self.assertEqual(release.image, 'autotest/example')
+        self.assertEqual(release.image, image)
 
         # post an image as a build using registry hostname + port
         url = "/v2/apps/test/builds".format(**locals())
@@ -358,8 +357,7 @@ def test_build_image_in_registry(self, mock_requests):
 
         build = Build.objects.get(uuid=response.data['uuid'])
         release = build.app.release_set.latest()
-        # Registry host + port is internally stripped off
-        self.assertEqual(release.image, 'autotest/example')
+        self.assertEqual(release.image, image)
 
     def test_build_image_in_registry_with_auth(self, mock_requests):
         """add authentication to the build"""