Skip to content

Commit 3f60df8

Browse files
author
Matthew Fisher
committed
fix(controller): use build image for publishing releases
1 parent 56f6414 commit 3f60df8

2 files changed

Lines changed: 7 additions & 11 deletions

File tree

api/views.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,10 @@ def create(self, request, *args, **kwargs):
493493
def post_save(self, build, created=False):
494494
if created:
495495
release = build.app.release_set.latest()
496-
new_release = release.new(build.owner, build=build)
496+
source_version = 'latest'
497+
if build.sha:
498+
source_version = 'git-{}'.format(build.sha)
499+
new_release = release.new(build.owner, build=build, source_version=source_version)
497500
initial = True if build.app.structure == {} else False
498501
try:
499502
build.app.deploy(build.owner, new_release, initial=initial)

registry/private.py

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ def publish_release(source, config, target):
5959
image['id'] = _new_id()
6060
config['DEIS_APP'] = target_image
6161
config['DEIS_RELEASE'] = target_tag
62-
image['config']['Env'] = _construct_env(image['config']['Env'], config)
62+
image['config']['Env'] = _construct_env(config)
6363
# update and tag the new image
6464
_commit(target_image, image, _empty_tar_archive(), target_tag)
6565

@@ -162,17 +162,10 @@ def _put_tag(image_id, repository_path, tag):
162162

163163
# utility functions
164164

165-
def _construct_env(env, config):
165+
def _construct_env(config):
166166
"Update current environment with latest config"
167167
new_env = []
168-
# see if we need to update existing ENV vars
169-
for e in env:
170-
k, v = e.split('=', 1)
171-
if k in config:
172-
# update values defined by config
173-
v = config.pop(k)
174-
new_env.append("{}={}".format(encode(k), encode(v)))
175-
# add other config ENV items
168+
# add config ENV items
176169
for k, v in config.items():
177170
new_env.append("{}={}".format(encode(k), encode(v)))
178171
return new_env

0 commit comments

Comments
 (0)