Merge pull request #1102 from kblcuk/master

Sourcing app-specific ENV during check-deploy
This commit is contained in:
Michael Hobbs committed 2015-04-09 09:10:18 -07:00
commit 6225a4113c
1 file changed
+2 -1
+2 -1
View File
@@ -46,8 +46,9 @@ if [[ -z "$DOKKU_APP_CONTAINER_ID" ]] && [[ -f "$DOKKU_ROOT/$APP/CONTAINER" ]];
fi fi
# source in app env to get DOKKU_CHECKS_WAIT and any other necessary vars # source global and in-app envs to get DOKKU_CHECKS_WAIT and any other necessary vars
[[ -f "$DOKKU_ROOT/ENV" ]] && source $DOKKU_ROOT/ENV [[ -f "$DOKKU_ROOT/ENV" ]] && source $DOKKU_ROOT/ENV
[[ -f "$DOKKU_ROOT/$APP/ENV" ]] && source $DOKKU_ROOT/$APP/ENV
# Wait this many seconds (default 5) for server to start before running checks. # Wait this many seconds (default 5) for server to start before running checks.
WAIT="${DOKKU_CHECKS_WAIT:-5}" WAIT="${DOKKU_CHECKS_WAIT:-5}"