Merge pull request #384 from colnpanic/features/notify-kill-failed

Ignore failures when trying to stop containers.
This commit is contained in:
Paul Lietar committed 2013-12-17 00:26:32 -08:00
commit c2aaa94523
2 files changed
+3 -3

No files matched your search

+1 -1
View File
@@ -59,7 +59,7 @@ case "$1" in
# kill the app when running # kill the app when running
if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
oldid=$(< "$DOKKU_ROOT/$APP/CONTAINER") oldid=$(< "$DOKKU_ROOT/$APP/CONTAINER")
docker kill $oldid > /dev/null docker kill $oldid > /dev/null 2>&1 || true
fi fi
# start the app # start the app
+2 -2
View File
@@ -16,8 +16,8 @@ case "$1" in
if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
ID=$(< "$DOKKU_ROOT/$APP/CONTAINER") ID=$(< "$DOKKU_ROOT/$APP/CONTAINER")
docker stop $ID > /dev/null docker stop $ID > /dev/null || true
docker rm $ID > /dev/null docker rm $ID > /dev/null || true
fi fi
docker images | grep $IMAGE | awk '{print $3}' | xargs docker rmi &> /dev/null & docker images | grep $IMAGE | awk '{print $3}' | xargs docker rmi &> /dev/null &