move image into build for better 12 factor compatibility

Author: Gabriel Monroy

api/migrations/0001_initial.py

@@ -166,6 +166,7 @@ def forwards(self, orm):
             ('app', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api.App'])),
             ('sha', self.gf('django.db.models.fields.CharField')(max_length=255, blank=True)),
             ('output', self.gf('django.db.models.fields.TextField')(blank=True)),
+            ('image', self.gf('django.db.models.fields.CharField')(default=u'deis/buildstep', max_length=256)),
             ('procfile', self.gf('api.fields.ProcfileField')(default=u'null', blank=True)),
             ('dockerfile', self.gf('django.db.models.fields.TextField')(blank=True)),
             ('config', self.gf('api.fields.EnvVarsField')(default=u'null', blank=True)),
@@ -187,7 +188,6 @@ def forwards(self, orm):
             ('app', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api.App'])),
             ('version', self.gf('django.db.models.fields.PositiveIntegerField')()),
             ('config', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api.Config'])),
-            ('image', self.gf('django.db.models.fields.CharField')(default=u'deis/buildstep', max_length=256)),
             ('build', self.gf('django.db.models.fields.related.ForeignKey')(to=orm['api.Build'], null=True, blank=True)),
         ))
         db.send_create_signal(u'api', ['Release'])
@@ -282,6 +282,7 @@ def backwards(self, orm):
             'config': ('api.fields.EnvVarsField', [], {'default': "u'null'", 'blank': 'True'}),
             'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
             'dockerfile': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
+            'image': ('django.db.models.fields.CharField', [], {'default': "u'deis/buildstep'", 'max_length': '256'}),
             'output': ('django.db.models.fields.TextField', [], {'blank': 'True'}),
             'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
             'procfile': ('api.fields.ProcfileField', [], {'default': "u'null'", 'blank': 'True'}),
@@ -391,7 +392,6 @@ def backwards(self, orm):
             'build': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Build']", 'null': 'True', 'blank': 'True'}),
             'config': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['api.Config']"}),
             'created': ('django.db.models.fields.DateTimeField', [], {'auto_now_add': 'True', 'blank': 'True'}),
-            'image': ('django.db.models.fields.CharField', [], {'default': "u'deis/buildstep'", 'max_length': '256'}),
             'owner': ('django.db.models.fields.related.ForeignKey', [], {'to': u"orm['auth.User']"}),
             'updated': ('django.db.models.fields.DateTimeField', [], {'auto_now': 'True', 'blank': 'True'}),
             'uuid': ('api.fields.UuidField', [], {'unique': 'True', 'max_length': '32', 'primary_key': 'True'}),

api/models.py

@@ -450,8 +450,9 @@ def flat(self):
     def build(self):
         config = Config.objects.create(
             version=1, owner=self.owner, app=self, values={})
+        build = Build.objects.create(owner=self.owner, app=self)
         Release.objects.create(
-            version=1, owner=self.owner, app=self, config=config)
+            version=1, owner=self.owner, app=self, config=config, build=build)
         self.formation.publish()
         tasks.build_app.delay(self).wait()
 
@@ -479,9 +480,8 @@ def calculate(self):
             release = releases[0]
             d['release']['version'] = release.version
             d['release']['config'] = release.config.values
-            d['release']['image'] = release.image
-            d['release']['build'] = {}
-            if release.build:
+            d['release']['build'] = {'image': release.build.image}
+            if release.build.url:
                 d['release']['build']['url'] = release.build.url
                 d['release']['build']['procfile'] = release.build.procfile
         d['containers'] = {}
@@ -518,7 +518,7 @@ def run(self, command):
         docker_args = ' '.join(
             ['-v',
              '/opt/deis/runtime/slugs/{app_id}-{version}/app:/app'.format(**locals()),
-             release.image])
+             release.build.image])
         base_cmd = "export HOME=/app; cd /app && for profile in " \
                    "`find /app/.profile.d/*.sh -type f`; do . $profile; done"
         command = "/bin/sh -c '{base_cmd} && {command}'".format(**locals())
@@ -684,6 +684,8 @@ class Build(UuidAuditedModel):
     sha = models.CharField('SHA', max_length=255, blank=True)
     output = models.TextField(blank=True)
 
+    image = models.CharField(max_length=256, default='deis/buildstep')
+
     procfile = fields.ProcfileField(blank=True)
     dockerfile = models.TextField(blank=True)
     config = fields.EnvVarsField(blank=True)
@@ -743,7 +745,6 @@ class Release(UuidAuditedModel):
     version = models.PositiveIntegerField()
 
     config = models.ForeignKey('Config')
-    image = models.CharField(max_length=256, default='deis/buildstep')
     build = models.ForeignKey('Build', blank=True, null=True)
 
     class Meta:
@@ -770,7 +771,6 @@ def new_release(sender, **kwargs):
     """
     user, app, = kwargs['user'], kwargs['app']
     last_release = Release.objects.filter(app=app).order_by('-created')[0]
-    image = kwargs.get('image', last_release.image)
     config = kwargs.get('config', last_release.config)
     build = kwargs.get('build', last_release.build)
     # overwrite config with build.config if the keys don't exist
@@ -788,7 +788,7 @@ def new_release(sender, **kwargs):
     # create new release and auto-increment version
     new_version = last_release.version + 1
     release = Release.objects.create(
-        owner=user, app=app, image=image, config=config,
+        owner=user, app=app, config=config,
         build=build, version=new_version)
     # converge the application
     app.converge()

api/tests/build.py

@@ -57,8 +57,8 @@ def test_build(self):
         url = "/api/apps/{app_id}/builds".format(**locals())
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.data['count'], 0)
-        # post a first build
+        self.assertEqual(response.data['count'], 1)
+        # post a new build
         body = {
             'sha': uuid.uuid4().hex,
             'slug_size': 4096000,

api/tests/release.py

@@ -47,7 +47,7 @@ def setUp(self):
     def test_release(self):
         """
         Test that a release is created when a formation is created, and
-        that updating config, build, image, args or triggers a new release
+        that updating config or build or triggers a new release
         """
         url = '/api/apps'
         body = {'formation': 'autotest'}
@@ -63,7 +63,6 @@ def test_release(self):
         response = self.client.get(url)
         self.assertEqual(response.status_code, 200)
         release1 = response.data
-        self.assertIn('image', response.data)
         self.assertIn('config', response.data)
         self.assertIn('build', response.data)
         self.assertEquals(release1['version'], 1)
@@ -81,7 +80,6 @@ def test_release(self):
         release2 = response.data
         self.assertNotEqual(release1['uuid'], release2['uuid'])
         self.assertNotEqual(release1['config'], release2['config'])
-        self.assertEqual(release1['image'], release2['image'])
         self.assertEqual(release1['build'], release2['build'])
         self.assertEquals(release2['version'], 2)
         # check that updating the build rolls a new release
@@ -106,7 +104,6 @@ def test_release(self):
         release3 = response.data
         self.assertNotEqual(release2['uuid'], release3['uuid'])
         self.assertNotEqual(release2['build'], release3['build'])
-        self.assertEqual(release2['image'], release3['image'])
         self.assertEquals(release3['version'], 3)
         # check that build config was respected
         self.assertNotEqual(release2['config'], release3['config'])