Merge pull request #1402 from progrium/jg-consolidate-config

Consolidate config
This commit is contained in:
Jose Diaz-Gonzalez
2015-09-01 16:39:33 -04:00
11 changed files with 265 additions and 206 deletions

View File

@@ -335,10 +335,11 @@ set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
# `DOKKU_DISABLE_DEPLOY` env var is set to `true` for an app
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
source "$PLUGIN_PATH/config/functions"
CONTAINERID="$1"; APP="$2"; PORT="$3" ; HOSTNAME="${4:-localhost}"
[[ -f "$DOKKU_ROOT/$APP/ENV" ]] && source $DOKKU_ROOT/$APP/ENV
eval "$(config_export app $APP)"
DOKKU_DISABLE_DEPLOY="${DOKKU_DISABLE_DEPLOY:-false}"
if [[ "$DOKKU_DISABLE_DEPLOY" = "true" ]]; then