diff --git a/functions b/functions index 0b8c8b4..c4e7ba5 100755 --- a/functions +++ b/functions @@ -75,7 +75,7 @@ service_link() { local SERVICE_URL=$(service_url "$SERVICE") local SERVICE_NAME=$(get_service_name "$SERVICE") local SERVICE_ROOT="$PLUGIN_DATA_ROOT/$SERVICE" - local EXISTING_CONFIG=$(dokku config "$APP") + local EXISTING_CONFIG=$(config_all "$APP") local LINK=$(echo "$EXISTING_CONFIG" | grep "$SERVICE_URL" | cut -d: -f1) || true local DEFAULT_ALIAS=$(echo "$EXISTING_CONFIG" | grep "${PLUGIN_DEFAULT_ALIAS}_URL") || true local SERVICE_ALIAS=$(service_alias "$SERVICE") @@ -92,7 +92,7 @@ service_link() { ALIAS=$(service_alternative_alias "$EXISTING_CONFIG") fi dokku docker-options:add "$APP" build,deploy,run "--link $SERVICE_NAME:$SERVICE_ALIAS" - dokku config:set "$APP" "${ALIAS}_URL=$SERVICE_URL" + config_set "$APP" "${ALIAS}_URL=$SERVICE_URL" } service_alternative_alias() { @@ -287,7 +287,7 @@ service_unlink() { 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") + local EXISTING_CONFIG=$(config_all "$APP") local SERVICE_ALIAS=$(service_alias "$SERVICE") local LINK=($(echo "$EXISTING_CONFIG" | grep "$SERVICE_URL" | cut -d: -f1)) || true @@ -295,7 +295,7 @@ service_unlink() { remove_from_links_file "$SERVICE" "$APP" dokku docker-options:remove "$APP" build,deploy,run "--link $SERVICE_NAME:$SERVICE_ALIAS" - dokku config:unset "$APP" "${LINK[*]}" + config_unset "$APP" "${LINK[*]}" } service_url() { @@ -339,7 +339,7 @@ promote() { local SERVICE="$1" local APP="$2" local PLUGIN_DEFAULT_CONFIG_VAR="${PLUGIN_DEFAULT_ALIAS}_URL" - local EXISTING_CONFIG=$(dokku config "$APP") + local EXISTING_CONFIG=$(config_all "$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 @@ -358,7 +358,9 @@ promote() { fi local PROMOTE_URL=$(get_url_from_config "$EXISTING_CONFIG" "${CONFIG_VARS[0]}") NEW_CONFIG_VARS+="$PLUGIN_DEFAULT_CONFIG_VAR=$PROMOTE_URL" - dokku config:set "$APP" $NEW_CONFIG_VARS + + # shellcheck disable=SC2086 + config_set "$APP" $NEW_CONFIG_VARS } remove_from_links_file() {