Merge pull request #1190 from deis/deis-build

`deis pull` as alternative to `git push` workflow

Author: Gabriel Monroy

Makefile

@@ -48,7 +48,7 @@ test: test-unit test-functional
 
 test-unit:
 	@if [ ! -d venv ]; then virtualenv venv; fi
-	venv/bin/pip install -q -r requirements.txt
+	venv/bin/pip install -q -r requirements.txt -r dev_requirements.txt
 	venv/bin/python manage.py test --noinput api
 
 test-functional:

api/models.py

@@ -462,7 +462,7 @@ class Meta:
     def __str__(self):
         return "{0}-v{1}".format(self.app.id, self.version)
 
-    def new(self, user, config=None, build=None, summary=None, source_version=None):
+    def new(self, user, config=None, build=None, summary=None, source_version='latest'):
         """
         Create a new application release using the provided Build and Config
         on behalf of a user.
@@ -473,24 +473,28 @@ def new(self, user, config=None, build=None, summary=None, source_version=None):
             config = self.config
         if not build:
             build = self.build
-        if not source_version:
-            source_version = 'latest'
-        else:
-            source_version = 'v{}'.format(source_version)
-        # prepare release tag
+        # always create a release off the latest image
+        source_image = '{}:{}'.format(build.image, source_version)
+        # construct fully-qualified target image
         new_version = self.version + 1
         tag = 'v{}'.format(new_version)
-        image = build.image + ':{tag}'.format(**locals())
+        release_image = '{}:{}'.format(self.app.id, tag)
+        target_image = '{}:{}/{}'.format(
+            settings.REGISTRY_HOST, settings.REGISTRY_PORT, self.app.id)
         # create new release and auto-increment version
         release = Release.objects.create(
             owner=user, app=self.app, config=config,
-            build=build, version=new_version, image=image, summary=summary)
-        # publish release to registry as new docker image
-        repository_path = self.app.id
-        publish_release(repository_path,
+            build=build, version=new_version, image=target_image, summary=summary)
+        # IOW, this image did not come from the builder
+        if not build.sha:
+            # we assume that the image is not present on our registry,
+            # so shell out a task to pull in the repository
+            tasks.import_repository.delay(build.image, self.app.id).get()
+            # update the source image to the repository we just imported
+            source_image = self.app.id
+        publish_release(source_image,
                         config.values,
-                        tag,
-                        source_tag=source_version)
+                        release_image,)
         return release
 
     def previous(self):
@@ -516,7 +520,9 @@ def save(self, *args, **kwargs):
             # compare this build to the previous build
             old_build = prev_release.build if prev_release else None
             # if the build changed, log it and who pushed it
-            if self.build != old_build:
+            if self.version == 1:
+                self.summary += "{} created initial release".format(self.app.owner)
+            elif self.build != old_build:
                 if self.build.sha:
                     self.summary += "{} deployed {}".format(self.build.owner, self.build.sha[:7])
                 else:

api/tasks.py

@@ -7,9 +7,11 @@
 
 from __future__ import unicode_literals
 
+import requests
 import threading
 
 from celery import task
+from django.conf import settings
 
 
 @task
@@ -34,6 +36,19 @@ def deploy_release(app, release):
     [t.join() for t in threads]
 
 
+@task
+def import_repository(source, target_repository):
+    """Imports an image from a remote registry into our own private registry"""
+    data = {
+        'src': source,
+    }
+    requests.post(
+        '{}/v1/repositories/{}/tags'.format(settings.REGISTRY_URL,
+                                            target_repository),
+        data=data,
+    )
+
+
 @task
 def start_containers(containers):
     create_threads = []
@@ -71,10 +86,10 @@ def run_command(c, command):
         if rc != 0:
             raise EnvironmentError('Could not pull image: {pull_image}'.format(**locals()))
         # run the command
-        docker_args = ' '.join(['-a', 'stdout', '-a', 'stderr', '--rm', image])
-        env_args = ' '.join(["-e '{k}={v}'".format(**locals())
-                             for k, v in release.config.values.items()])
-        command = "docker run {env_args} {docker_args} {command}".format(**locals())
+        docker_args = ' '.join(['--entrypoint=/bin/sh',
+                                '-a', 'stdout', '-a', 'stderr', '--rm', image])
+        escaped_command = command.replace("'", "'\\''")
+        command = r"docker run {docker_args} -c \'{escaped_command}\'".format(**locals())
         return c.run(command)
     finally:
         c.delete()

api/tests/test_build.py

@@ -7,13 +7,22 @@
 from __future__ import unicode_literals
 
 import json
+import mock
+import requests
 
 from django.test import TransactionTestCase
 from django.test.utils import override_settings
 
 from api.models import Build
 
 
+def mock_import_repository_task(*args, **kwargs):
+    resp = requests.Response()
+    resp.status_code = 200
+    resp._content_consumed = True
+    return resp
+
+
 @override_settings(CELERY_ALWAYS_EAGER=True)
 class BuildTest(TransactionTestCase):
 
@@ -30,6 +39,7 @@ def setUp(self):
                                     content_type='application/json')
         self.assertEqual(response.status_code, 201)
 
+    @mock.patch('requests.post', mock_import_repository_task)
     def test_build(self):
         """
         Test that a null build is created and that users can post new builds
@@ -71,6 +81,7 @@ def test_build(self):
         self.assertEqual(self.client.patch(url).status_code, 405)
         self.assertEqual(self.client.delete(url).status_code, 405)
 
+    @mock.patch('requests.post', mock_import_repository_task)
     def test_build_default_containers(self):
         url = '/api/apps'
         body = {'cluster': 'autotest'}
@@ -152,6 +163,7 @@ def test_build_default_containers(self):
         self.assertEqual(container['type'], 'web')
         self.assertEqual(container['num'], 1)
 
+    @mock.patch('requests.post', mock_import_repository_task)
     def test_build_str(self):
         """Test the text representation of a build."""
         url = '/api/apps'

api/tests/test_config.py

@@ -7,13 +7,22 @@
 from __future__ import unicode_literals
 
 import json
+import mock
+import requests
 
 from django.test import TransactionTestCase
 from django.test.utils import override_settings
 
 from api.models import Config
 
 
+def mock_import_repository_task(*args, **kwargs):
+    resp = requests.Response()
+    resp.status_code = 200
+    resp._content_consumed = True
+    return resp
+
+
 @override_settings(CELERY_ALWAYS_EAGER=True)
 class ConfigTest(TransactionTestCase):
 
@@ -30,6 +39,7 @@ def setUp(self):
                                     content_type='application/json')
         self.assertEqual(response.status_code, 201)
 
+    @mock.patch('requests.post', mock_import_repository_task)
     def test_config(self):
         """
         Test that config is auto-created for a new app and that
@@ -94,6 +104,7 @@ def test_config(self):
         self.assertEqual(self.client.delete(url).status_code, 405)
         return config5
 
+    @mock.patch('requests.post', mock_import_repository_task)
     def test_config_set_same_key(self):
         """
         Test that config sets on the same key function properly
@@ -116,6 +127,7 @@ def test_config_set_same_key(self):
         self.assertIn('PORT', json.loads(response.data['values']))
         self.assertEqual(json.loads(response.data['values'])['PORT'], '5001')
 
+    @mock.patch('requests.post', mock_import_repository_task)
     def test_config_str(self):
         """Test the text representation of a node."""
         config5 = self.test_config()

api/tests/test_container.py

@@ -7,6 +7,8 @@
 from __future__ import unicode_literals
 
 import json
+import mock
+import requests
 
 from django.contrib.auth.models import User
 from django.test import TransactionTestCase
@@ -17,9 +19,15 @@
 from api.models import Container, App
 
 
+def mock_import_repository_task(*args, **kwargs):
+    resp = requests.Response()
+    resp.status_code = 200
+    resp._content_consumed = True
+    return resp
+
+
 @override_settings(CELERY_ALWAYS_EAGER=True)
 class ContainerTest(TransactionTestCase):
-
     """Tests creation of containers on nodes"""
 
     fixtures = ['tests.json']
@@ -174,6 +182,7 @@ def test_container_api_heroku(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
+    @mock.patch('requests.post', mock_import_repository_task)
     def test_container_api_docker(self):
         url = '/api/apps'
         body = {'cluster': 'autotest'}
@@ -233,6 +242,7 @@ def test_container_api_docker(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
 
+    @mock.patch('requests.post', mock_import_repository_task)
     def test_container_release(self):
         url = '/api/apps'
         body = {'cluster': 'autotest'}

api/tests/test_hooks.py

@@ -7,13 +7,22 @@
 from __future__ import unicode_literals
 
 import json
+import mock
+import requests
 
 from django.test import TransactionTestCase
 from django.test.utils import override_settings
 
 from django.conf import settings
 
 
+def mock_import_repository_task(*args, **kwargs):
+    resp = requests.Response()
+    resp.status_code = 200
+    resp._content_consumed = True
+    return resp
+
+
 @override_settings(CELERY_ALWAYS_EAGER=True)
 class HookTest(TransactionTestCase):
 
@@ -95,6 +104,7 @@ def test_push_abuse(self):
                                     HTTP_X_DEIS_BUILDER_AUTH=settings.BUILDER_KEY)
         self.assertEqual(response.status_code, 403)
 
+    @mock.patch('requests.post', mock_import_repository_task)
     def test_build_hook(self):
         """Test creating a Build via an API Hook"""
         url = '/api/apps'

api/tests/test_release.py

@@ -7,13 +7,22 @@
 from __future__ import unicode_literals
 
 import json
+import mock
+import requests
 
 from django.test import TransactionTestCase
 from django.test.utils import override_settings
 
 from api.models import Release
 
 
+def mock_import_repository_task(*args, **kwargs):
+    resp = requests.Response()
+    resp.status_code = 200
+    resp._content_consumed = True
+    return resp
+
+
 @override_settings(CELERY_ALWAYS_EAGER=True)
 class ReleaseTest(TransactionTestCase):
 
@@ -30,6 +39,7 @@ def setUp(self):
                                     content_type='application/json')
         self.assertEqual(response.status_code, 201)
 
+    @mock.patch('requests.post', mock_import_repository_task)
     def test_release(self):
         """
         Test that a release is created when a cluster is created, and
@@ -101,6 +111,7 @@ def test_release(self):
         self.assertEqual(self.client.delete(url).status_code, 405)
         return release3
 
+    @mock.patch('requests.post', mock_import_repository_task)
     def test_release_rollback(self):
         url = '/api/apps'
         body = {'cluster': 'autotest'}
@@ -187,12 +198,14 @@ def test_release_rollback(self):
         self.assertIn('NEW_URL1', values)
         self.assertEqual('http://localhost:8080/', values['NEW_URL1'])
 
+    @mock.patch('requests.post', mock_import_repository_task)
     def test_release_str(self):
         """Test the text representation of a release."""
         release3 = self.test_release()
         release = Release.objects.get(uuid=release3['uuid'])
         self.assertEqual(str(release), "{}-v3".format(release3['app']))
 
+    @mock.patch('requests.post', mock_import_repository_task)
     def test_release_summary(self):
         """Test the text summary of a release."""
         release3 = self.test_release()

api/views.py

@@ -428,10 +428,10 @@ def rollback(self, request, *args, **kwargs):
             build=prev.build,
             config=prev.config,
             summary=summary,
-            source_version=version)
+            source_version='v{}'.format(version))
         app.deploy(new_release)
-        msg = "Rolled back to v{}".format(version)
-        return Response(msg, status=status.HTTP_201_CREATED)
+        response = {'version': new_release.version}
+        return Response(response, status=status.HTTP_201_CREATED)
 
 
 class AppContainerViewSet(OwnerViewSet):

deis/settings.py

@@ -278,7 +278,9 @@
 
 # registry settings
 REGISTRY_MODULE = 'registry.mock'
-REGISTRY_URL = os.environ.get('DEIS_REGISTRY_URL', None)
+REGISTRY_URL = 'http://localhost:5000'
+REGISTRY_HOST = 'localhost'
+REGISTRY_PORT = 5000
 
 # check if we can register users with `deis register`
 REGISTRATION_ENABLED = True