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

Merge pull request #6725 from dokku/4662-warn-on-published-port

Browse Source
This commit is contained in:
Jose Diaz-Gonzalez
2024-03-15 09:43:55 -04:00
committed by GitHub
parent a759b03739 c9b9c2ab25
commit be9a608d3f
2 changed files with 83 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
plugins/scheduler-docker-local/bin/scheduler-deploy-process
View File

@@ -47,6 +47,33 @@ fn-scheduler-deploy-process() {
fi
fi
local DOCKER_ARGS
DOCKER_ARGS=$(: | plugn trigger docker-args-deploy "$APP" "$IMAGE_TAG" "$PROC_TYPE")
DOCKER_ARGS+=$(: | plugn trigger docker-args-process-deploy "$APP" "$IMAGE_SOURCE_TYPE" "$IMAGE_TAG" "$PROC_TYPE")
DOCKER_ARGS=" $DOCKER_ARGS "
declare -a ARG_ARRAY
eval "ARG_ARRAY=($DOCKER_ARGS)"
local port_published=false
for arg in "${ARG_ARRAY[@]}"; do
if [[ "$arg" == "-p "* ]] || [[ "$arg" =~ "--publish "* ]] || [[ "$arg" == "-P" ]] || [[ "$arg" =~ "--publish-all"* ]]; then
port_published=true
break
fi
done
if [[ "$port_published" == "true" ]]; then
local warned_on_publish=false
if [[ "$PROC_COUNT" -gt 1 ]]; then
warned_on_publish=true
dokku_log_warn "Deploys may fail when publishing ports and scaling to multiple containers. Consider scaling process type $PROC_TYPE to 1."
fi
if [[ "$DOKKU_CHECKS_DISABLED" != "true" ]] && [[ "$warned_on_publish" == "false" ]]; then
warned_on_publish=true
dokku_log_warn "Deploys may fail when publishing ports and enabling zero downtime. Consider disabling zero downtime for process type $PROC_TYPE."
fi
fi
PARALLEL_DEPLOY_COUNT="$(plugn trigger "app-json-process-deploy-parallelism" "$APP" "$PROC_TYPE")"
DOKKU_CHECKS_DISABLED="$DOKKU_CHECKS_DISABLED" INJECT_INIT_FLAG="$INJECT_INIT_FLAG" parallel --will-cite --halt soon,fail=1 --jobs "$PARALLEL_DEPLOY_COUNT" --ungroup <"$PROCESS_TMP_FILE"

56
tests/unit/scheduler-docker-local.bats
View File

@@ -119,3 +119,59 @@ teardown() {
assert_success
assert_output_contains "docker-init" 0
}
@test "(scheduler-docker-local) publish ports" {
run create_app
echo "output: $output"
echo "status: $status"
assert_success
run deploy_app
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Deploys may fail when publishing ports and scaling to multiple containers" 0
assert_output_contains "Deploys may fail when publishing ports and enabling zero downtime" 0
run /bin/bash -c "dokku docker-options:add $TEST_APP deploy '--publish 5000:5000'"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku ps:scale --skip-deploy $TEST_APP web=2"
echo "output: $output"
echo "status: $status"
assert_success
# the expected output will be seen twice due to how parallel re-outputs stderr in its own output...
run /bin/bash -c "dokku ps:rebuild $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_failure
assert_output_contains "Deploys may fail when publishing ports and scaling to multiple containers" 2
assert_output_contains "Deploys may fail when publishing ports and enabling zero downtime" 0
run /bin/bash -c "dokku ps:scale --skip-deploy $TEST_APP web=1"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku ps:rebuild $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_failure
assert_output_contains "Deploys may fail when publishing ports and scaling to multiple containers" 0
assert_output_contains "Deploys may fail when publishing ports and enabling zero downtime" 2
run /bin/bash -c "dokku checks:disable $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
run /bin/bash -c "dokku ps:rebuild $TEST_APP"
echo "output: $output"
echo "status: $status"
assert_success
assert_output_contains "Deploys may fail when publishing ports and scaling to multiple containers" 0
assert_output_contains "Deploys may fail when publishing ports and enabling zero downtime" 0
}