Merge pull request #2709 from dokku/mh/fix/default-curl-timeouts

increase CURL_TIMEOUT and CURL_CONNECT_TIMEOUT defaults
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2017-04-10 13:39:42 -06:00
commit c52f60f9d7
2 files changed
+4 -4

No files matched your search

+2 -2
View File
@@ -9,8 +9,8 @@ build_env_pre_build_buildpack() {
local APP="$1"; local IMAGE=$(get_app_image_name "$APP"); local BUILD_ENV="" local APP="$1"; local IMAGE=$(get_app_image_name "$APP"); local BUILD_ENV=""
verify_app_name "$APP" verify_app_name "$APP"
[[ -z $(config_get --global CURL_CONNECT_TIMEOUT) ]] && config_set --global CURL_CONNECT_TIMEOUT=5 [[ -z $(config_get --global CURL_CONNECT_TIMEOUT) ]] && config_set --global CURL_CONNECT_TIMEOUT=90
[[ -z $(config_get --global CURL_TIMEOUT) ]] && config_set --global CURL_TIMEOUT=30 [[ -z $(config_get --global CURL_TIMEOUT) ]] && config_set --global CURL_TIMEOUT=60
if [[ -n $(config_export global) ]]; then if [[ -n $(config_export global) ]]; then
local BUILD_ENV+=$'\n' local BUILD_ENV+=$'\n'
+2 -2
View File
@@ -35,12 +35,12 @@ teardown() {
assert_success assert_success
deploy_app deploy_app
run /bin/bash -c "dokku config:get --global CURL_CONNECT_TIMEOUT | grep 5" run /bin/bash -c "dokku config:get --global CURL_CONNECT_TIMEOUT | grep 90"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success
run /bin/bash -c "dokku config:get --global CURL_TIMEOUT | grep 30" run /bin/bash -c "dokku config:get --global CURL_TIMEOUT | grep 60"
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_success assert_success