From 1bad26426ec537ed4898c57ec2a7b3ab52dd2451 Mon Sep 17 00:00:00 2001 From: Michael Hobbs Date: Wed, 1 Apr 2015 13:49:55 -0700 Subject: [PATCH] force testing .env with no newline and actually fix #1025 and #1026. closes #1063 --- plugins/build-env/pre-build | 1 + tests/apps/ruby/.env | 1 + 2 files changed, 2 insertions(+) create mode 100644 tests/apps/ruby/.env diff --git a/plugins/build-env/pre-build b/plugins/build-env/pre-build index fa14ac60b..033973c40 100755 --- a/plugins/build-env/pre-build +++ b/plugins/build-env/pre-build @@ -10,6 +10,7 @@ APP="$1"; IMAGE="dokku/$APP"; BUILD_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+=$'\n' BUILD_ENV+=$(< "$DOKKU_ROOT/ENV") BUILD_ENV+=$'\n' fi diff --git a/tests/apps/ruby/.env b/tests/apps/ruby/.env new file mode 100644 index 000000000..4b145e474 --- /dev/null +++ b/tests/apps/ruby/.env @@ -0,0 +1 @@ +export BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-ruby#v129 \ No newline at end of file