Merge pull request #3568 from dokku/fix-global-clearing

Correct issue with clearing global domains
This commit is contained in:
Jose Diaz-Gonzalez authored and GitHub committed 2019-05-23 06:56:07 -04:00
commit 625424de68
3 files changed
+4 -2

No files matched your search

+1 -1
View File
@@ -170,7 +170,7 @@ domains_add_global() {
) -eq 0 ]]; then ) -eq 0 ]]; then
dokku_log_info1 "Skipping: $DOMAIN already added" dokku_log_info1 "Skipping: $DOMAIN already added"
else else
sed -i -e "\$a\\$DOMAIN" "$GLOBAL_VHOST_PATH" grep -qxF "$DOMAIN" "$GLOBAL_VHOST_PATH" || echo "$DOMAIN" >>"$GLOBAL_VHOST_PATH"
dokku_log_info1 "Added $DOMAIN" dokku_log_info1 "Added $DOMAIN"
fi fi
done done
+2 -1
View File
@@ -9,7 +9,8 @@ domains_clear_global_cmd() {
local cmd="domains:clear-global" local cmd="domains:clear-global"
shift 1 shift 1
dokku_log_info1_quiet "Clearing global domains"
domains_clear_global "$@" domains_clear_global "$@"
} }
domains_add_global_cmd "$@" domains_clear_global_cmd "$@"
+1
View File
@@ -253,6 +253,7 @@ teardown() {
run /bin/bash -c "dokku domains:clear-global" run /bin/bash -c "dokku domains:clear-global"
echo "output: $output" echo "output: $output"
echo "status: $status" echo "status: $status"
assert_success
refute_line "global.dokku.invalid" refute_line "global.dokku.invalid"
refute_line "global.dokku.me" refute_line "global.dokku.me"
} }