Read DATABASE_ADAPTER variable from app when setting DATABASE_URL

This commit is contained in:
Peter West
2016-01-18 15:58:16 +00:00
parent cdd357b058
commit b7b25c91a0
4 changed files with 53 additions and 0 deletions

View File

@@ -70,6 +70,7 @@ service_exposed_ports() {
service_link() {
local APP="$2"
local SERVICE="$1"
update_plugin_scheme_for_app "$APP"
local SERVICE_URL=$(service_url "$SERVICE")
local SERVICE_NAME=$(get_service_name "$SERVICE")
local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE"
@@ -253,6 +254,7 @@ service_stop() {
service_unlink() {
local APP="$2"
local SERVICE="$1"
update_plugin_scheme_for_app "$APP"
local SERVICE_URL=$(service_url "$SERVICE")
local SERVICE_NAME=$(get_service_name "$SERVICE")
local EXISTING_CONFIG=$(dokku config "$APP")
@@ -309,6 +311,7 @@ promote() {
local APP="$2"
local PLUGIN_DEFAULT_CONFIG_VAR="${PLUGIN_DEFAULT_ALIAS}_URL"
local EXISTING_CONFIG=$(dokku config "$APP")
update_plugin_scheme_for_app "$APP"
local SERVICE_URL=$(service_url "$SERVICE")
local CONFIG_VARS=($(echo "$EXISTING_CONFIG" | grep "$SERVICE_URL" | cut -d: -f1)) || true
local PREVIOUS_DEFAULT_URL=$(get_url_from_config "$EXISTING_CONFIG" "$PLUGIN_DEFAULT_CONFIG_VAR")
@@ -350,3 +353,9 @@ service_linked_apps() {
tr '\n' ' ' < "$LINKS_FILE"
}
update_plugin_scheme_for_app() {
local APP=$1
local DATABASE_ADAPTER=$(dokku config:get $APP DATABASE_ADAPTER)
PLUGIN_SCHEME=${DATABASE_ADAPTER:-$PLUGIN_SCHEME}
}