Merge pull request #1331 from alexkruegger/master

[bugfix] in nginx.conf.template getting from /app directory
This commit is contained in:
Jose Diaz-Gonzalez
2015-07-20 10:50:55 -04:00

View File

@@ -50,7 +50,7 @@ case "$1" in
fi
DOKKU_APP_CIDS=($(get_app_container_ids $APP))
docker cp "${DOKKU_APP_CID[0]}:/app/nginx.conf.template" "$APP_NGINX_TEMPLATE" 2> /dev/null || true
docker cp "${DOKKU_APP_CIDS[0]}:/app/nginx.conf.template" "$DOKKU_ROOT/$APP/" 2> /dev/null || true
[[ -f "$DOKKU_ROOT/ENV" ]] && source $DOKKU_ROOT/ENV
[[ -f "$DOKKU_ROOT/$APP/ENV" ]] && source $DOKKU_ROOT/$APP/ENV