Merge pull request #248 from helgi/k8s_env

feat(registry): stop adding last mile ENV Vars into slugs as k8s handles that

Author: helgi

rootfs/api/models.py

@@ -847,7 +847,7 @@ def publish(self, source_version='latest'):
         # If the build has a SHA, assume it's from deis-builder and in the deis-registry already
         deis_registry = bool(self.build.sha)
         if not self.build.dockerfile and not self.build.sha:
-            publish_release(source_image, self.config.values, self.image, deis_registry)
+            publish_release(source_image, self.image, deis_registry)
 
     def previous(self):
         """

rootfs/registry/dockerclient.py

@@ -2,7 +2,6 @@
 """Support the Deis workflow by manipulating and publishing Docker images."""
 
 from __future__ import unicode_literals
-import io
 import logging
 
 from django.conf import settings
@@ -22,7 +21,7 @@ def __init__(self):
         self.client = docker.Client(version='auto')
         self.registry = settings.REGISTRY_HOST + ':' + str(settings.REGISTRY_PORT)
 
-    def publish_release(self, source, config, target, deis_registry):
+    def publish_release(self, source, target, deis_registry):
         """Update a source Docker image with environment config and publish it to deis-registry."""
         # get the source repository name and tag
         src_name, src_tag = docker.utils.parse_repository_tag(source)
@@ -42,29 +41,12 @@ def publish_release(self, source, config, target, deis_registry):
         self.pull(repo, src_tag)
 
         # tag the image locally without the repository URL
-        image = "{}:{}".format(repo, src_tag)
-        self.tag(image, src_name, tag=src_tag)
-
-        # build a Docker image that adds a "last-mile" layer of environment
-        config.update({'DEIS_APP': name, 'DEIS_RELEASE': tag})
-        self.build(source, config, name, tag)
+        image = "{}:{}".format(src_name, src_tag)
+        self.tag(image, "{}/{}".format(self.registry, name), tag=tag)
 
         # push the image to deis-registry
         self.push("{}/{}".format(self.registry, name), tag)
 
-    def build(self, source, config, repo, tag):
-        """Add a "last-mile" layer of environment config to a Docker image for deis-registry."""
-        check_blacklist(repo)
-        env = ' '.join("{}='{}'".format(
-            k, v.encode('unicode-escape').replace("'", "\\'")) for k, v in config.viewitems())
-        dockerfile = "FROM {}\nENV {}".format(source, env)
-        f = io.BytesIO(dockerfile.encode('utf-8'))
-        target_repo = "{}/{}:{}".format(self.registry, repo, tag)
-        logger.info("Building Docker image {}".format(target_repo))
-        with SimpleFlock(self.FLOCKFILE, timeout=1200):
-            stream = self.client.build(fileobj=f, tag=target_repo, stream=True, rm=True)
-            log_output(stream)
-
     def pull(self, repo, tag):
         """Pull a Docker image into the local storage graph."""
         check_blacklist(repo)
@@ -112,7 +94,6 @@ def strip_prefix(name):
     return '/'.join(p for p in paths if p and '.' not in p and ':' not in p)
 
 
-def publish_release(source, config, target, deis_registry):
-
+def publish_release(source, target, deis_registry):
     client = DockerClient()
-    return client.publish_release(source, config, target, deis_registry)
+    return client.publish_release(source, target, deis_registry)

rootfs/registry/models.py

@@ -25,44 +25,22 @@ def setUp(self):
 
     def test_publish_release(self, mock_client):
         self.client = DockerClient()
-        self.client.publish_release('ozzy/embryo:git-f2a8020',
-                                    {'POWERED_BY': 'Deis'}, 'ozzy/embryo:v4', True)
+        self.client.publish_release('ozzy/embryo:git-f2a8020', 'ozzy/embryo:v4', True)
         self.assertTrue(self.client.client.pull.called)
         self.assertTrue(self.client.client.tag.called)
-        self.assertTrue(self.client.client.build.called)
         self.assertTrue(self.client.client.push.called)
         # Test that a registry host prefix is replaced with deis-registry for the target
-        self.client.publish_release('ozzy/embryo:git-f2a8020',
-                                    {'POWERED_BY': 'Deis'}, 'quay.io/ozzy/embryo:v4', True)
+        self.client.publish_release('ozzy/embryo:git-f2a8020', 'quay.io/ozzy/embryo:v4', True)
         docker_push = self.client.client.push
         docker_push.assert_called_with(
             'localhost:5000/ozzy/embryo', tag='v4', insecure_registry=True, stream=True)
         # Test that blacklisted image names can't be published
         with self.assertRaises(PermissionDenied):
             self.client.publish_release(
-                'deis/controller:v1.11.1', {}, 'deis/controller:v1.11.1', True)
+                'deis/controller:v1.11.1', 'deis/controller:v1.11.1', True)
         with self.assertRaises(PermissionDenied):
             self.client.publish_release(
-                'localhost:5000/deis/controller:v1.11.1', {}, 'deis/controller:v1.11.1', True)
-
-    def test_build(self, mock_client):
-        # test that self.client.build was called with proper arguments
-        self.client = DockerClient()
-        self.client.build('ozzy/embryo:git-f3a8020', {'POWERED_BY': 'Deis'}, 'ozzy/embryo', 'v4')
-        docker_build = self.client.client.build
-        self.assertTrue(docker_build.called)
-        args = {"rm": True, "tag": u'localhost:5000/ozzy/embryo:v4', "stream": True}
-        kwargs = docker_build.call_args[1]
-        self.assertDictContainsSubset(args, kwargs)
-        # test that the fileobj arg to "docker build" contains a correct Dockerfile
-        f = kwargs['fileobj']
-        self.assertEqual(f.read(), "FROM ozzy/embryo:git-f3a8020\nENV POWERED_BY='Deis'")
-        # Test that blacklisted image names can't be built
-        with self.assertRaises(PermissionDenied):
-            self.client.build('deis/controller:v1.11.1', {}, 'deis/controller', 'v1.11.1')
-        with self.assertRaises(PermissionDenied):
-            self.client.build(
-                'localhost:5000/deis/controller:v1.11.1', {}, 'deis/controller', 'v1.11.1')
+                'localhost:5000/deis/controller:v1.11.1', 'deis/controller:v1.11.1', True)
 
     def test_pull(self, mock_client):
         self.client = DockerClient()