From 3b41d6d16f8b9b6b1d56a3eacc2d384a195adcc4 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Thu, 11 Dec 2014 11:02:59 -0800 Subject: [PATCH] create build env for both dokku and new style buildpacks --- plugins/build-env/pre-build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/build-env/pre-build b/plugins/build-env/pre-build index 27a6045d7..28ac78ea0 100755 --- a/plugins/build-env/pre-build +++ b/plugins/build-env/pre-build @@ -5,8 +5,8 @@ APP="$1"; IMAGE="dokku/$APP"; BUILD_ENV="" [[ -f "$DOKKU_ROOT/BUILD_ENV" ]] && cat "$DOKKU_ROOT/BUILD_ENV" >> "$DOKKU_ROOT/ENV" && rm "$DOKKU_ROOT/BUILD_ENV" -! (grep -q CURL_CONNECT_TIMEOUT "$DOKKU_ROOT/ENV") && echo "export CURL_CONNECT_TIMEOUT=5" >> "$DOKKU_ROOT/ENV" -! (grep -q CURL_TIMEOUT "$DOKKU_ROOT/ENV") && echo "export CURL_TIMEOUT=30" >> "$DOKKU_ROOT/ENV" +! (grep -q CURL_CONNECT_TIMEOUT "$DOKKU_ROOT/ENV" > /dev/null 2>&1) && echo "export CURL_CONNECT_TIMEOUT=5" >> "$DOKKU_ROOT/ENV" +! (grep -q CURL_TIMEOUT "$DOKKU_ROOT/ENV" > /dev/null 2>&1) && echo "export CURL_TIMEOUT=30" >> "$DOKKU_ROOT/ENV" if [[ -f "$DOKKU_ROOT/ENV" ]]; then BUILD_ENV+=$(< "$DOKKU_ROOT/ENV")