dokku/dokku-mysql
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: allow unlinking a service regardless of config status

Browse Source 
Closes dokku/dokku-redis#92
This commit is contained in:
Jose Diaz-Gonzalez
2018-01-11 22:55:42 -05:00
parent 83df40711c
commit 6775daa8d4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
common-functions
View File

@@ -575,7 +575,6 @@ service_unlink() {
local SERVICE_ALIAS=$(service_alias "$SERVICE") local SERVICE_ALIAS=$(service_alias "$SERVICE")
local LINK=($(echo "$EXISTING_CONFIG" | grep "$SERVICE_URL" | cut -d: -f1)) || true local LINK=($(echo "$EXISTING_CONFIG" | grep "$SERVICE_URL" | cut -d: -f1)) || true
[[ -z ${LINK[*]} ]] && dokku_log_fail "Not linked to app $APP"
remove_from_links_file "$SERVICE" "$APP" remove_from_links_file "$SERVICE" "$APP"
if declare -f -F add_passed_docker_option > /dev/null; then if declare -f -F add_passed_docker_option > /dev/null; then
@@ -585,6 +584,8 @@ service_unlink() {
else else
dokku docker-options:remove "$APP" build,deploy,run "--link $SERVICE_NAME:$SERVICE_ALIAS" dokku docker-options:remove "$APP" build,deploy,run "--link $SERVICE_NAME:$SERVICE_ALIAS"
fi fi
[[ -z ${LINK[*]} ]] && dokku_log_fail "Not linked to app $APP"
config_unset "$APP" "${LINK[*]}" config_unset "$APP" "${LINK[*]}"
} }