Mirrors/dokku
1
0
Fork 0
mirror of https://github.com/dokku/dokku.git synced 2025-12-29 00:25:08 +01:00
Code Issues Packages Projects Releases Wiki Activity

do not exit when docker fails

Browse Source
This commit is contained in:
jay becker
2013-12-15 20:20:46 -06:00
parent 74dfb605d7
commit 1050f350c0
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
if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
oldid=$(< "$DOKKU_ROOT/$APP/CONTAINER")
docker kill $oldid > /dev/null
docker kill $oldid > /dev/null 2>&1 || true
fi
# 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
ID=$(< "$DOKKU_ROOT/$APP/CONTAINER")
docker stop $ID > /dev/null
docker rm $ID > /dev/null
docker stop $ID > /dev/null || true
docker rm $ID > /dev/null || true
fi
docker images | grep $IMAGE | awk '{print $3}' | xargs docker rmi &> /dev/null &