github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

Merge pull request #2170 from jvanbaarsen/dont-fail-duplicated-domain

Browse Source 
Dont fail when adding a duplicated domain
This commit is contained in:
Michael Hobbs
2016-05-10 14:06:04 -07:00
parent 4e99078ac1 86ef6ae5d1
commit 25a2801cb1
2 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/domains/functions
View File

@@ -66,15 +66,15 @@ domains_add() {
verify_app_name "$1" verify_app_name "$1"
local APP="$1"; local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST" local APP="$1"; local APP_VHOST_PATH="$DOKKU_ROOT/$APP/VHOST"
if [[ $(egrep -w "^${2}$" "$APP_VHOST_PATH" > /dev/null 2>&1; echo $?) -eq 0 ]]; then
dokku_log_fail "$2 is already defined for $APP"
exit 1
fi
shift 1 shift 1
for DOMAIN in "$@"; do for DOMAIN in "$@"; do
echo "$DOMAIN" >> "$APP_VHOST_PATH" if [[ $(egrep -w "^$DOMAIN$" "$APP_VHOST_PATH" > /dev/null 2>&1; echo $?) -eq 0 ]]; then
dokku_log_info1 "Added $DOMAIN to $APP" dokku_log_info1 "Skipping: $DOMAIN already added to $APP"
else
echo "$DOMAIN" >> "$APP_VHOST_PATH"
dokku_log_info1 "Added $DOMAIN to $APP"
fi
done done
if [[ "$(is_app_vhost_enabled "$APP")" == "false" ]];then if [[ "$(is_app_vhost_enabled "$APP")" == "false" ]];then

2
tests/unit/20_domains.bats
View File

@@ -49,7 +49,7 @@ teardown() {
run dokku domains:add $TEST_APP test.app.dokku.me run dokku domains:add $TEST_APP test.app.dokku.me
echo "output: "$output echo "output: "$output
echo "status: "$status echo "status: "$status
assert_failure assert_success
} }
@test "(domains) domains:remove" { @test "(domains) domains:remove" {