Merge pull request #275 from smothiki/types

feat(workflow): add build_type in extra args to differentiate build t…

Author: Sivaram Mothiki

rootfs/api/models.py

@@ -26,7 +26,7 @@
 from rest_framework.authtoken.models import Token
 
 from registry import publish_release
-from api.utils import dict_diff, dict_merge, fingerprint, generate_app_name
+from api.utils import dict_diff, dict_merge, fingerprint, generate_app_name, app_build_type
 
 
 User = settings.AUTH_USER_MODEL
@@ -313,6 +313,7 @@ def scale(self, user, structure):  # noqa
 
     def _scale_containers(self, scale_types, to_remove):
         release = self.release_set.latest()
+        build_type = app_build_type(release)
         for scale_type in scale_types:
             image = release.image
             version = "v{}".format(release.version)
@@ -325,6 +326,7 @@ def _scale_containers(self, scale_types, to_remove):
                 'aname': self.id,
                 'num': scale_types[scale_type],
                 'app_type': scale_type,
+                'build_type': build_type,
                 'healthcheck': release.config.healthcheck()
             }
 
@@ -423,6 +425,7 @@ def deploy(self, user, release):
             self._default_scale(user, release)
 
     def _deploy_app(self, scale_types, release, existing):
+        build_type = app_build_type(release)
         for scale_type in scale_types:
             image = release.image
             version = "v{}".format(release.version)
@@ -435,6 +438,7 @@ def _deploy_app(self, scale_types, release, existing):
                 'num': 0,
                 'version': version,
                 'app_type': scale_type,
+                'build_type': build_type,
                 'healthcheck': release.config.healthcheck()
             }
 

rootfs/api/utils.py

@@ -109,6 +109,15 @@ def fingerprint(key):
     return ':'.join(a + b for a, b in zip(fp_plain[::2], fp_plain[1::2]))
 
 
+def app_build_type(release):
+    if not release.build.dockerfile:
+        if not release.build.sha:
+            return "deispull"
+        else:
+            return "buildpack"
+    return "dockerfile"
+
+
 def dict_merge(origin, merge):
     """
     Recursively merges dict's. not just simple a["key"] = b["key"], if

rootfs/scheduler/__init__.py

@@ -604,15 +604,11 @@ def _create_rc(self, name, image, command, **kwargs):  # noqa
 
         # Check if it is a slug builder image.
         # Example format: golden-earrings:git-5450cbcdaaf9afe6fadd219c94ac9c449bd62413s
-        image_name = image[image.index(':')+1:]
-        if '-' in image_name:
-            vcs, sha = image_name.split('-')
-            if vcs == 'git' and len(sha) in [8, 40] and app_type == 'web':
-                imgurl = 'http://{}/git/home/{}/push/slug.tgz'.format(
-                    settings.S3EP,
-                    image
-                )
-                TEMPLATE = RCB_TEMPLATE
+        if kwargs.get('build_type', {}) == "buildpack":
+            imgurl = 'http://{}/git/home/{}/push/slug.tgz'.format(
+                settings.S3EP,
+                image)
+            TEMPLATE = RCB_TEMPLATE
 
         l = {
             "name": name,