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

only attempt to stop a checks-disabled container if it is actually running. closes #2278

Browse Source
This commit is contained in:
Michael Hobbs
2016-06-28 20:32:04 -07:00
parent b20a91d24f
commit ae972cf3cd
3 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
plugins/checks/check-deploy
View File

@@ -58,7 +58,7 @@ checks_check_deploy() {
eval "$(config_export global)" eval "$(config_export global)"
eval "$(config_export app "$APP")" eval "$(config_export app "$APP")"
if [[ "$(is_app_proctype_checks_skipped "$APP" "$PROC_TYPE")" == "true" ]]; then if [[ "$(is_app_proctype_checks_skipped "$APP" "$DOKKU_APP_CONTAINER_TYPE")" == "true" ]]; then
dokku_log_info2_quiet "Zero downtime checks for app ($APP) have been skipped. moving on..." dokku_log_info2_quiet "Zero downtime checks for app ($APP) have been skipped. moving on..."
exit 0 exit 0
fi fi

12
plugins/common/functions
View File

@@ -288,7 +288,7 @@ copy_from_image() {
} }
get_app_container_ids() { get_app_container_ids() {
declare desc="returns list of docker container ids for given app/container_type" declare desc="returns list of docker container ids for given app and optional container_type"
local APP="$1"; local CONTAINER_TYPE="$2" local APP="$1"; local CONTAINER_TYPE="$2"
verify_app_name "$APP" verify_app_name "$APP"
[[ -f $DOKKU_ROOT/$APP/CONTAINER ]] && DOKKU_CIDS+=$(< "$DOKKU_ROOT/$APP/CONTAINER") [[ -f $DOKKU_ROOT/$APP/CONTAINER ]] && DOKKU_CIDS+=$(< "$DOKKU_ROOT/$APP/CONTAINER")
@@ -315,15 +315,15 @@ get_app_container_ids() {
} }
get_app_running_container_ids() { get_app_running_container_ids() {
declare desc="return list of running docker container ids for given apps" declare desc="return list of running docker container ids for given app and optional container_type"
local APP=$1 local APP="$1" CONTAINER_TYPE="$2"
verify_app_name "$APP" verify_app_name "$APP"
! (is_deployed "$APP") && dokku_log_fail "App $APP has not been deployed" ! (is_deployed "$APP") && dokku_log_fail "App $APP has not been deployed"
local CIDS=$(get_app_container_ids "$APP") local CIDS=$(get_app_container_ids "$APP" "$CONTAINER_TYPE")
for CID in $CIDS; do for CID in $CIDS; do
local APP_CONTAINER_STATUS=$(docker inspect -f '{{.State.Running}}' "$CID" || true) local APP_CONTAINER_STATUS=$(docker inspect -f '{{.State.Running}}' "$CID" 2>/dev/null || true)
[[ "$APP_CONTAINER_STATUS" == "true" ]] && local APP_RUNNING_CONTAINER_IDS+="$CID " [[ "$APP_CONTAINER_STATUS" == "true" ]] && local APP_RUNNING_CONTAINER_IDS+="$CID "
done done
@@ -540,7 +540,7 @@ dokku_deploy_cmd() {
if [[ "$(is_app_proctype_checks_disabled "$APP" "$PROC_TYPE")" == "true" ]]; then if [[ "$(is_app_proctype_checks_disabled "$APP" "$PROC_TYPE")" == "true" ]]; then
dokku_log_info1 "zero downtime is disabled for app ($APP.$PROC_TYPE). stopping currently running containers" dokku_log_info1 "zero downtime is disabled for app ($APP.$PROC_TYPE). stopping currently running containers"
local cid proctype_oldids="$(get_app_container_ids "$APP" "$PROC_TYPE")" local cid proctype_oldids="$(get_app_running_container_ids "$APP" "$PROC_TYPE")"
for cid in $proctype_oldids; do for cid in $proctype_oldids; do
dokku_log_info2 "stopping $APP.$PROC_TYPE ($cid)" dokku_log_info2 "stopping $APP.$PROC_TYPE ($cid)"
# shellcheck disable=SC2086 # shellcheck disable=SC2086

29
tests/unit/10_checks.bats
View File

@@ -172,3 +172,32 @@ teardown() {
echo "status: "$status echo "status: "$status
assert_output "web,notifications" assert_output "web,notifications"
} }
@test "(checks) checks:disable -> app start with missing containers" {
run bash -c "dokku ps:scale $TEST_APP worker=1"
echo "output: "$output
echo "status: "$status
assert_success
deploy_app
run bash -c "dokku checks:disable $TEST_APP worker"
echo "output: "$output
echo "status: "$status
assert_success
run bash -c "dokku ps:stop $TEST_APP"
echo "output: "$output
echo "status: "$status
assert_success
run bash -c "dokku cleanup"
echo "output: "$output
echo "status: "$status
assert_success
run bash -c "dokku ps:start $TEST_APP"
echo "output: "$output
echo "status: "$status
assert_success
}