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

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

Browse Source 
increase CURL_TIMEOUT and CURL_CONNECT_TIMEOUT defaults
This commit is contained in:
Jose Diaz-Gonzalez
2017-04-10 13:39:42 -06:00
committed by GitHub
parent c815d732eb 18849c085a
commit c52f60f9d7
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
plugins/build-env/pre-build-buildpack
View File

@@ -9,8 +9,8 @@ build_env_pre_build_buildpack() {
local APP="$1"; local IMAGE=$(get_app_image_name "$APP"); local BUILD_ENV=""
verify_app_name "$APP"
[[ -z $(config_get --global CURL_CONNECT_TIMEOUT) ]] && config_set --global CURL_CONNECT_TIMEOUT=5
[[ -z $(config_get --global CURL_TIMEOUT) ]] && config_set --global CURL_TIMEOUT=30
[[ -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=60
if [[ -n $(config_export global) ]]; then
local BUILD_ENV+=$'\n'

4
tests/unit/20_build-env.bats
View File

@@ -35,12 +35,12 @@ teardown() {
assert_success
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 "status: "$status
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 "status: "$status
assert_success