Merge pull request #1146 from progrium/1142_mh-domains-no-redeploy
don't re-deploy on domains:add. allow multple domains on command line. closes #1142
This commit is contained in:
commit
713a8d4f31
3 files changed
+32
-10
No files matched your search
@@ -71,8 +71,8 @@ case "$1" in
|
|||||||
verify_app_name "$2"
|
verify_app_name "$2"
|
||||||
APP="$2"
|
APP="$2"
|
||||||
|
|
||||||
if [[ -z $3 ]]; then
|
if [[ -z "${*:3}" ]]; then
|
||||||
echo "Usage: dokku $1 $APP DOMAIN"
|
echo "Usage: dokku $1 $APP DOMAIN [DOMAIN ...]"
|
||||||
echo "Must specify DOMAIN."
|
echo "Must specify DOMAIN."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
@@ -82,12 +82,17 @@ case "$1" in
|
|||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
shift 2
|
||||||
dokku domains:setup $APP
|
dokku domains:setup $APP
|
||||||
echo "$3" >> "$DOKKU_ROOT/$APP/VHOST"
|
for DOMAIN in "$@";do
|
||||||
|
echo "$DOMAIN" >> "$DOKKU_ROOT/$APP/VHOST"
|
||||||
|
done
|
||||||
# we need to restart the app to make sure we're binding to the appropriate network interface
|
# we need to restart the app to make sure we're binding to the appropriate network interface
|
||||||
dokku ps:restart $APP
|
dokku nginx:build-config $APP
|
||||||
pluginhook post-domains-update $APP
|
pluginhook post-domains-update $APP
|
||||||
dokku_log_info1 "Added $3 to $APP"
|
for DOMAIN in "$@";do
|
||||||
|
dokku_log_info1 "Added $DOMAIN to $APP"
|
||||||
|
done
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
@@ -108,16 +113,21 @@ case "$1" in
|
|||||||
verify_app_name "$2"
|
verify_app_name "$2"
|
||||||
APP="$2"
|
APP="$2"
|
||||||
|
|
||||||
if [[ -z $3 ]]; then
|
if [[ -z "${*:3}" ]]; then
|
||||||
echo "Usage: dokku $1 $2 DOMAIN"
|
echo "Usage: dokku $1 $APP DOMAIN [DOMAIN ...]"
|
||||||
echo "Must specify DOMAIN."
|
echo "Must specify DOMAIN."
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
shift 2
|
||||||
dokku domains:setup $APP
|
dokku domains:setup $APP
|
||||||
sed -i "/^$3$/d" "$DOKKU_ROOT/$APP/VHOST"
|
for DOMAIN in "$@";do
|
||||||
|
sed -i "/^$DOMAIN$/d" "$DOKKU_ROOT/$APP/VHOST"
|
||||||
|
done
|
||||||
pluginhook post-domains-update $APP
|
pluginhook post-domains-update $APP
|
||||||
dokku_log_info1 "Removed $3 from $APP"
|
for DOMAIN in "$@";do
|
||||||
|
dokku_log_info1 "Removed $DOMAIN from $APP"
|
||||||
|
done
|
||||||
|
|
||||||
;;
|
;;
|
||||||
|
|
||||||
|
|||||||
@@ -97,7 +97,12 @@ teardown() {
|
|||||||
echo "status: "$status
|
echo "status: "$status
|
||||||
assert_success
|
assert_success
|
||||||
|
|
||||||
CONTAINER_ID=$(docker ps --no-trunc| grep dokku/$TEST_APP | grep "start web" | awk '{ print $1 }')
|
run dokku ps:restart $TEST_APP
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
|
||||||
|
CONTAINER_ID=$(docker ps --no-trunc| grep dokku/$TEST_APP | grep "start web" | awk '{ print $1 }' | head -1)
|
||||||
run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep '[0-9]*'"
|
run bash -c "docker port $CONTAINER_ID | sed 's/[0-9.]*://' | egrep '[0-9]*'"
|
||||||
echo "output: "$output
|
echo "output: "$output
|
||||||
echo "status: "$status
|
echo "status: "$status
|
||||||
|
|||||||
@@ -28,6 +28,13 @@ teardown() {
|
|||||||
assert_success
|
assert_success
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@test "(domains) domains:add (multiple)" {
|
||||||
|
run dokku domains:add $TEST_APP www.test.app.dokku.me test.app.dokku.me
|
||||||
|
echo "output: "$output
|
||||||
|
echo "status: "$status
|
||||||
|
assert_success
|
||||||
|
}
|
||||||
|
|
||||||
@test "(domains) domains:remove" {
|
@test "(domains) domains:remove" {
|
||||||
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
|
||||||
|
|||||||
Reference in new issue
Block a user