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

Don't fail if CONTAINER is inexistant.

Browse Source
This commit is contained in:
Paul Lietar
2013-11-21 21:15:13 +00:00
parent e42c028d18
commit 8a9182c859
3 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dokku
View File

@@ -52,7 +52,7 @@ case "$1" in
pluginhook pre-deploy $APP $IMAGE pluginhook pre-deploy $APP $IMAGE
# kill the app when running # kill the app when running
if [[ -f "$DOKKU_ROOT/$APP/PORT" ]]; 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
fi fi

21
plugins/00_dokku-standard/commands
View File

@@ -13,11 +13,14 @@ case "$1" in
fi fi
pluginhook pre-delete $APP pluginhook pre-delete $APP
ID=$(< "$DOKKU_ROOT/$APP/CONTAINER") if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
ID=$(< "$DOKKU_ROOT/$APP/CONTAINER")
docker stop $ID > /dev/null
docker rm $ID > /dev/null
fi
docker stop $ID > /dev/null
docker images | grep $IMAGE | awk '{print $3}' | xargs docker rmi &> /dev/null & docker images | grep $IMAGE | awk '{print $3}' | xargs docker rmi &> /dev/null &
docker rm $ID > /dev/null
pluginhook post-delete $APP pluginhook post-delete $APP
;; ;;
@@ -33,10 +36,14 @@ case "$1" in
exit 1 exit 1
fi fi
CONTAINER=$(<$DOKKU_ROOT/$APP/CONTAINER) if [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]]; then
docker logs $CONTAINER | tail -n 100 CONTAINER=$(<$DOKKU_ROOT/$APP/CONTAINER)
if [[ $3 == "-t" ]]; then docker logs $CONTAINER | tail -n 100
docker attach $CONTAINER if [[ $3 == "-t" ]]; then
docker attach $CONTAINER
fi
else
echo "Application's container not found"
fi fi
;; ;;

2
plugins/config/commands
View File

@@ -108,7 +108,6 @@ case "$1" in
APP="$2"; APP_DIR="$DOKKU_ROOT/$APP" APP="$2"; APP_DIR="$DOKKU_ROOT/$APP"
ENV_ADD="" ENV_ADD=""
ENV_TEMP=`cat "${ENV_FILE}"` ENV_TEMP=`cat "${ENV_FILE}"`
ID=$(< "$APP_DIR/CONTAINER")
RESTART=false RESTART=false
VARS="${*:3}" VARS="${*:3}"
@@ -151,7 +150,6 @@ case "$1" in
APP="$2"; APP_DIR="$DOKKU_ROOT/$APP" APP="$2"; APP_DIR="$DOKKU_ROOT/$APP"
ENV_TEMP=`cat "${ENV_FILE}"` ENV_TEMP=`cat "${ENV_FILE}"`
ID=$(< "$APP_DIR/CONTAINER")
VARS="${*:3}" VARS="${*:3}"
for var in $VARS; do for var in $VARS; do