From 66ad7d098573d9ff32f01893dffbddc12f18b89b Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Thu, 20 Aug 2015 23:27:30 -0400 Subject: [PATCH] Use `dokku config` to check if an env has output --- 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 e9453d736..1bf72de9b 100755 --- a/plugins/build-env/pre-build +++ b/plugins/build-env/pre-build @@ -9,12 +9,12 @@ APP="$1"; IMAGE="dokku/$APP"; BUILD_ENV="" dokku config:get --global CURL_CONNECT_TIMEOUT > /dev/null 2>&1 || dokku config:set --global CURL_CONNECT_TIMEOUT=5 dokku config:get --global CURL_TIMEOUT > /dev/null 2>&1 || dokku config:set --global CURL_TIMEOUT=30 -if [[ -f "$DOKKU_ROOT/ENV" ]]; then +if [[ -n $(dokku config --global --export) ]]; then BUILD_ENV+=$'\n' BUILD_ENV+=$(< "$DOKKU_ROOT/ENV") BUILD_ENV+=$'\n' fi -if [[ -f "$DOKKU_ROOT/$APP/ENV" ]]; then +if [[ -n $(dokku config $APP --export) ]]; then BUILD_ENV+=$'\n' BUILD_ENV+=$(< "$DOKKU_ROOT/$APP/ENV") BUILD_ENV+=$'\n'