Commit 4df2c024 authored by Victor Nikulshin's avatar Victor Nikulshin
Browse files

Merge branch 'features/docker-clean-execute' into '2.x' 

Use fabric API to execute subtasks in docker.clean



See merge request !25
parents c6acd3e4 749e0863

docker.py

+4 −4
Original line number Diff line number Diff line 
from __future__ import unicode_literals



from fabric.api import task, roles, env, local, run, lcd

from fabric.api import task, roles, env, local, run, lcd, execute

from fabric.colors import red, green

from fabric.contrib.console import confirm
@@ -231,9 +231,9 @@ def clean(): 
            red('This will stop, remove container and delete docker image ' +

                'related to this project. Do you want to continue?'),

            default=False)):

        container_stop()

        container_remove()

        image_remove()

        execute(container_stop)

        execute(container_remove)

        execute(image_remove)





@task