cleanup container state files when proc type is removed from app. closes #2230

This commit is contained in:
Michael Hobbs
2016-06-09 16:17:45 -07:00
parent 5ff73995f2
commit 2cedc19b2a
5 changed files with 71 additions and 28 deletions

View File

@@ -6,9 +6,10 @@ named_containers_post_deploy() {
declare desc="names deployed app container is consistent manner"
local trigger="named_containers_post_deploy"
local APP="$1"; local APP_ROOT="$DOKKU_ROOT/$APP"
[[ -z $(stat -t "$APP_ROOT"/CONTAINER.* 2>/dev/null) ]] && exit 0
local container
for container in "$APP_ROOT"/CONTAINER.*; do
shopt -s nullglob
for container in $APP_ROOT/CONTAINER.*; do
local DYNO=$(echo "$container" | sed -r 's/.*CONTAINER\.(.*)/\1/') || true
local NAME="$APP.$DYNO"
local CURRENT_CONTAINER_ID="$(< "$container")"
@@ -29,9 +30,12 @@ named_containers_post_deploy() {
fi
local ID=$(cat "$container")
local CURRENT_NAME=$(docker inspect -f '{{.Name}}' "$ID" | tr -d /)
dokku_log_info2_quiet "renaming container (${ID:0:12}) $CURRENT_NAME to $NAME"
docker rename "$CURRENT_NAME" "$NAME" > /dev/null
if [[ -n "$CURRENT_NAME" ]]; then
dokku_log_info2_quiet "renaming container (${ID:0:12}) $CURRENT_NAME to $NAME"
docker rename "$CURRENT_NAME" "$NAME" > /dev/null
fi
done
shopt -u nullglob
}
named_containers_post_deploy "$@"