Merge pull request #2076 from gabrtv/increment-run

fix(controller): increment run containers and keep db models

Author: Gabriel Monroy

controller/api/models.py

@@ -172,7 +172,7 @@ def create(self, *args, **kwargs):
 
     def delete(self, *args, **kwargs):
         """Delete this application including all containers"""
-        for c in self.container_set.all():
+        for c in self.container_set.exclude(type='run'):
             c.destroy()
         self._clean_app_logs()
         return super(App, self).delete(*args, **kwargs)
@@ -344,31 +344,28 @@ def run(self, user, command):
         # TODO: add support for interactive shell
         msg = "{} runs '{}'".format(user.username, command)
         log_event(self, msg)
-        c_num = max([c.num for c in self.container_set.filter(type='admin')] or [0]) + 1
-        try:
-            # create database record for admin process
-            c = Container.objects.create(owner=self.owner,
-                                         app=self,
-                                         release=self.release_set.latest(),
-                                         type='admin',
-                                         num=c_num)
-            image = c.release.image + ':v' + str(c.release.version)
-
-            # check for backwards compatibility
-            def _has_hostname(image):
-                repo, tag = utils.parse_repository_tag(image)
-                return True if '/' in repo and '.' in repo.split('/')[0] else False
-
-            if not _has_hostname(image):
-                image = '{}:{}/{}'.format(settings.REGISTRY_HOST,
-                                          settings.REGISTRY_PORT,
-                                          image)
-            # SECURITY: shell-escape user input
-            escaped_command = command.replace("'", "'\\''")
-            return c.run(escaped_command)
-        # always cleanup admin containers
-        finally:
-            c.delete()
+        c_num = max([c.num for c in self.container_set.filter(type='run')] or [0]) + 1
+
+        # create database record for run process
+        c = Container.objects.create(owner=self.owner,
+                                     app=self,
+                                     release=self.release_set.latest(),
+                                     type='run',
+                                     num=c_num)
+        image = c.release.image + ':v' + str(c.release.version)
+
+        # check for backwards compatibility
+        def _has_hostname(image):
+            repo, tag = utils.parse_repository_tag(image)
+            return True if '/' in repo and '.' in repo.split('/')[0] else False
+
+        if not _has_hostname(image):
+            image = '{}:{}/{}'.format(settings.REGISTRY_HOST,
+                                      settings.REGISTRY_PORT,
+                                      image)
+        # SECURITY: shell-escape user input
+        escaped_command = command.replace("'", "'\\''")
+        return c.run(escaped_command)
 
 
 @python_2_unicode_compatible

controller/api/views.py

@@ -392,6 +392,8 @@ def get_queryset(self, **kwargs):
         container_type = self.kwargs.get('type')
         if container_type:
             qs = qs.filter(type=container_type)
+        else:
+            qs = qs.exclude(type='run')
         return qs
 
     def get_object(self, *args, **kwargs):