github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

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

Browse Source 
Ignore failures when trying to stop containers.
This commit is contained in:
Paul Lietar
2013-12-17 00:26:32 -08:00
parent 74dfb605d7 1050f350c0
commit c2aaa94523
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dokku
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

4
plugins/00_dokku-standard/commands
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 &