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

small refactor to support config_set for globals (#2147)

Browse Source 
* initial pass at config refactor

* support --shell and make sure we unset config globals
This commit is contained in:
Michael Hobbs
2016-04-26 18:08:54 -07:00
parent cb9efa3322
commit 64f83f976e
2 changed files with 54 additions and 45 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) ]] && dokku config:set --global CURL_CONNECT_TIMEOUT=5
[[ -z $(config_get --global CURL_TIMEOUT) ]] && dokku config:set --global CURL_TIMEOUT=30
[[ -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
if [[ -n $(config_export global) ]]; then
local BUILD_ENV+=$'\n'