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

Merge pull request #1081 from progrium/1063_mh-test-env-sans-newline

Browse Source 
force testing .env with no newline and actually fix #1025 and #1026. closes #1063
This commit is contained in:
Jose Diaz-Gonzalez
2015-04-03 15:18:17 -04:00
parent 6ac59dcdfc 1bad26426e
commit 29023927f5
2 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
plugins/build-env/pre-build
View File

@@ -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" ! (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 if [[ -f "$DOKKU_ROOT/ENV" ]]; then
BUILD_ENV+=$'\n'
BUILD_ENV+=$(< "$DOKKU_ROOT/ENV") BUILD_ENV+=$(< "$DOKKU_ROOT/ENV")
BUILD_ENV+=$'\n' BUILD_ENV+=$'\n'
fi fi

1
tests/apps/ruby/.env Normal file
View File

@@ -0,0 +1 @@
export BUILDPACK_URL=https://github.com/heroku/heroku-buildpack-ruby#v129