Skip to content

Commit f7bde6f

Browse files
author
Matthew Fisher
committed
Merge pull request #1058 from deis/scale-before-push
fix(controller): set default release image
2 parents 9beb70e + fd05885 commit f7bde6f

2 files changed

Lines changed: 2 additions & 1 deletion

File tree

controller/api/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -452,7 +452,7 @@ class Release(UuidAuditedModel):
452452
config = models.ForeignKey('Config')
453453
build = models.ForeignKey('Build')
454454
# NOTE: image contains combined build + config, ready to run
455-
image = models.CharField(max_length=256)
455+
image = models.CharField(max_length=256, default=settings.DEFAULT_BUILD)
456456

457457
class Meta:
458458
get_latest_by = 'created'

controller/api/tests/test_release.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ def test_release(self):
7070
self.assertIn('config', response.data)
7171
self.assertIn('build', response.data)
7272
self.assertEquals(release1['version'], 1)
73+
self.assertEquals(release1['image'], 'deis/helloworld')
7374
# check to see that a new release was created
7475
url = '/api/apps/{app_id}/releases/v2'.format(**locals())
7576
response = self.client.get(url)

0 commit comments

Comments
 (0)