Skip to content

Commit b40aa2a

Browse files
author
Gabriel Monroy
committed
remove dupe release, fix rollback publishing
1 parent 27c1efe commit b40aa2a

1 file changed

Lines changed: 6 additions & 4 deletions

File tree

api/views.py

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
from rest_framework.generics import get_object_or_404
2424
from rest_framework.response import Response
2525

26-
from api import models, serializers
26+
from api import docker, models, serializers
2727

2828
from deis import settings
2929

@@ -631,6 +631,11 @@ def rollback(self, request, *args, **kwargs):
631631
app.release_set.create(owner=request.user, version=last_version + 1,
632632
build=prev.build, config=prev.config,
633633
summary=summary)
634+
# publish release to registry as new docker image
635+
if settings.REGISTRY_URL:
636+
repository_path = "{}/{}".format(app.owner.username, app.id)
637+
tag = 'v{}'.format(last_version + 1)
638+
docker.publish_release(repository_path, prev.config.values, tag)
634639
app.converge()
635640
msg = "Rolled back to v{}".format(version)
636641
return Response(msg, status=status.HTTP_201_CREATED)
@@ -707,9 +712,6 @@ def create(self, request, *args, **kwargs):
707712
def post_save(self, obj, created=False):
708713
if created:
709714
# create a new release
710-
models.release_signal.send(
711-
sender=self, build=obj, app=obj.app,
712-
user=obj.owner)
713715
models.release_signal.send(sender=self, build=obj, app=obj.app, user=obj.owner)
714716
# see if we need to scale an initial web container
715717
app = obj.app

0 commit comments

Comments
 (0)