Merge pull request #2557 from dokku/dokku-cli-improvements
Dokku cli improvements
This commit is contained in:
commit
4e7b1c77e3
5 files changed
+106
-48
No files matched your search
+90
-44
@@ -1,10 +1,9 @@
|
|||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
set -eo pipefail; [[ $DOKKU_TRACE ]] && set -x
|
||||||
|
export DOKKU_PORT=${DOKKU_PORT:=22}
|
||||||
|
export DOKKU_HOST=${DOKKU_HOST:=}
|
||||||
|
|
||||||
MOVES=(ABLE ABNORMA AGAIN AIREXPL ANG ANGER ASAIL ATTACK AURORA AWL BAN BAND BARE BEAT BEATED BELLY BIND BITE BLOC BLOOD BODY BOOK BREATH BUMP CAST CHAM CLAMP CLAP CLAW CLEAR CLI CLIP CLOUD CONTRO CONVY COOLHIT CRASH CRY CUT DESCRI D-FIGHT DIG DITCH DIV DOZ DRE DUL DU-PIN DYE EARTH EDU EG-BOMB EGG ELEGY ELE-HIT EMBODY EMPLI ENGL ERUPT EVENS EXPLOR EYES FALL FAST F-CAR F-DANCE FEARS F-FIGHT FIGHT FIR FIRE FIREHIT FLAME FLAP FLASH FLEW FORCE FRA FREEZE FROG G-BIRD GENKISS GIFT G-KISS G-MOUSE GRADE GROW HAMMER HARD HAT HATE H-BOMB HELL-R HEMP HINT HIT HU HUNT HYPNOSI INHA IRO IRONBAR IR-WING J-GUN KEE KICK KNIF KNIFE KNOCK LEVEL LIGH LIGHHIT LIGHT LIVE L-WALL MAD MAJUS MEL MELO MESS MILK MIMI MISS MIXING MOVE MUD NI-BED NOISY NOONLI NULL N-WAVE PAT PEACE PIN PLAN PLANE POIS POL POWDE POWE POWER PRIZE PROTECT PROUD RAGE RECOR REFLAC REFREC REGR RELIV RENEW R-FIGHT RING RKICK ROCK ROUND RUS RUSH SAND SAW SCISSOR SCRA SCRIPT SEEN SERVER SHADOW SHELL SHINE SHO SIGHT SIN SMALL SMELT SMOK SNAKE SNO SNOW SOU SO-WAVE SPAR SPEC SPID S-PIN SPRA STAM STARE STEA STONE STORM STRU STRUG STUDEN SUBS SUCID SUN-LIG SUNRIS SUPLY S-WAVE TAILS TANGL TASTE TELLI THANK TONKICK TOOTH TORL TRAIN TRIKICK TUNGE VOLT WA-GUN WATCH WAVE W-BOMB WFALL WFING WHIP WHIRL WIND WOLF WOOD WOR YUJA)
|
fn-random-number() {
|
||||||
NAMES=(SEED GRASS FLOWE SHAD CABR SNAKE GOLD COW GUIKI PEDAL DELAN B-FLY BIDE KEYU FORK LAP PIGE PIJIA CAML LAT BIRD BABOO VIV ABOKE PIKAQ RYE SAN BREAD LIDEL LIDE PIP PIKEX ROK JUGEN PUD BUDE ZHIB GELU GRAS FLOW LAFUL ATH BALA CORN MOLUF DESP DAKED MIMI BOLUX KODA GELUD MONK SUMOY GEDI WENDI NILEM NILE NILEC KEZI YONGL HUDE WANLI GELI GUAIL MADAQ WUCI WUCI MUJEF JELLY SICIB GELU NELUO BOLI JIALE YED YEDE CLO SCARE AOCO DEDE DEDEI BAWU JIUG BADEB BADEB HOLE BALUX GES FANT QUAR YIHE SWAB SLIPP CLU DEPOS BILIY YUANO SOME NO YELA EMPT ZECUN XIAHE BOLEL DEJI MACID XIHON XITO LUCK MENJI GELU DECI XIDE DASAJ DONGN RICUL MINXI BALIY ZENDA LUZEL HELE5 0FENB KAIL JIAND CARP JINDE LAPU MUDE YIFU LINLI SANDI HUSI JINC OUMU OUMUX CAP KUIZA PUD TIAO FRMAN CLAU SPARK DRAGO BOLIU GUAIL MIYOU MIY QIAOK BEIL MUKEI RIDED MADAM BAGEP CROC ALIGE OUDAL OUD DADA HEHE YEDEA NUXI NUXIN ROUY ALIAD STICK QIANG LAAND PIQI PI PUPI DEKE DEKEJ NADI NADIO MALI PEA ELECT FLOWE MAL MALI HUSHU NILEE YUZI POPOZ DUZI HEBA XIAN SHAN YEYEA WUY LUO KEFE HULA CROW YADEH MOW ANNAN SUONI KYLI HULU HUDEL YEHE GULAE YEHE BLU GELAN BOAT NIP POIT HELAK XINL BEAR LINB MAGEH MAGEJ WULI YIDE RIVE FISH AOGU DELIE MANTE KONMU DELU HELU HUAN HUMA DONGF JINCA HEDE DEFU LIBY JIAPA MEJI HELE BUHU MILK HABI THUN GARD DON YANGQ SANAQ BANQ LUJ PHIX SIEI EGG)
|
|
||||||
|
|
||||||
random_number() {
|
|
||||||
[[ -n "$1" ]] && RANGE="$1"
|
[[ -n "$1" ]] && RANGE="$1"
|
||||||
if [[ -n "$RANGE" ]]; then
|
if [[ -n "$RANGE" ]]; then
|
||||||
number=$RANDOM
|
number=$RANDOM
|
||||||
@@ -15,10 +14,14 @@ random_number() {
|
|||||||
echo $number
|
echo $number
|
||||||
}
|
}
|
||||||
|
|
||||||
random_name() {
|
fn-random-name() {
|
||||||
NUM1=$(random_number ${#MOVES[@]})
|
local NUM1 NUM2 NUM3 UPPER_APPNAME lower_appname
|
||||||
NUM2=$(random_number ${#MOVES[@]})
|
local MOVES=(ABLE ABNORMA AGAIN AIREXPL ANG ANGER ASAIL ATTACK AURORA AWL BAN BAND BARE BEAT BEATED BELLY BIND BITE BLOC BLOOD BODY BOOK BREATH BUMP CAST CHAM CLAMP CLAP CLAW CLEAR CLI CLIP CLOUD CONTRO CONVY COOLHIT CRASH CRY CUT DESCRI D-FIGHT DIG DITCH DIV DOZ DRE DUL DU-PIN DYE EARTH EDU EG-BOMB EGG ELEGY ELE-HIT EMBODY EMPLI ENGL ERUPT EVENS EXPLOR EYES FALL FAST F-CAR F-DANCE FEARS F-FIGHT FIGHT FIR FIRE FIREHIT FLAME FLAP FLASH FLEW FORCE FRA FREEZE FROG G-BIRD GENKISS GIFT G-KISS G-MOUSE GRADE GROW HAMMER HARD HAT HATE H-BOMB HELL-R HEMP HINT HIT HU HUNT HYPNOSI INHA IRO IRONBAR IR-WING J-GUN KEE KICK KNIF KNIFE KNOCK LEVEL LIGH LIGHHIT LIGHT LIVE L-WALL MAD MAJUS MEL MELO MESS MILK MIMI MISS MIXING MOVE MUD NI-BED NOISY NOONLI NULL N-WAVE PAT PEACE PIN PLAN PLANE POIS POL POWDE POWE POWER PRIZE PROTECT PROUD RAGE RECOR REFLAC REFREC REGR RELIV RENEW R-FIGHT RING RKICK ROCK ROUND RUS RUSH SAND SAW SCISSOR SCRA SCRIPT SEEN SERVER SHADOW SHELL SHINE SHO SIGHT SIN SMALL SMELT SMOK SNAKE SNO SNOW SOU SO-WAVE SPAR SPEC SPID S-PIN SPRA STAM STARE STEA STONE STORM STRU STRUG STUDEN SUBS SUCID SUN-LIG SUNRIS SUPLY S-WAVE TAILS TANGL TASTE TELLI THANK TONKICK TOOTH TORL TRAIN TRIKICK TUNGE VOLT WA-GUN WATCH WAVE W-BOMB WFALL WFING WHIP WHIRL WIND WOLF WOOD WOR YUJA)
|
||||||
NUM3=$(random_number ${#NAMES[@]})
|
local NAMES=(SEED GRASS FLOWE SHAD CABR SNAKE GOLD COW GUIKI PEDAL DELAN B-FLY BIDE KEYU FORK LAP PIGE PIJIA CAML LAT BIRD BABOO VIV ABOKE PIKAQ RYE SAN BREAD LIDEL LIDE PIP PIKEX ROK JUGEN PUD BUDE ZHIB GELU GRAS FLOW LAFUL ATH BALA CORN MOLUF DESP DAKED MIMI BOLUX KODA GELUD MONK SUMOY GEDI WENDI NILEM NILE NILEC KEZI YONGL HUDE WANLI GELI GUAIL MADAQ WUCI WUCI MUJEF JELLY SICIB GELU NELUO BOLI JIALE YED YEDE CLO SCARE AOCO DEDE DEDEI BAWU JIUG BADEB BADEB HOLE BALUX GES FANT QUAR YIHE SWAB SLIPP CLU DEPOS BILIY YUANO SOME NO YELA EMPT ZECUN XIAHE BOLEL DEJI MACID XIHON XITO LUCK MENJI GELU DECI XIDE DASAJ DONGN RICUL MINXI BALIY ZENDA LUZEL HELE5 0FENB KAIL JIAND CARP JINDE LAPU MUDE YIFU LINLI SANDI HUSI JINC OUMU OUMUX CAP KUIZA PUD TIAO FRMAN CLAU SPARK DRAGO BOLIU GUAIL MIYOU MIY QIAOK BEIL MUKEI RIDED MADAM BAGEP CROC ALIGE OUDAL OUD DADA HEHE YEDEA NUXI NUXIN ROUY ALIAD STICK QIANG LAAND PIQI PI PUPI DEKE DEKEJ NADI NADIO MALI PEA ELECT FLOWE MAL MALI HUSHU NILEE YUZI POPOZ DUZI HEBA XIAN SHAN YEYEA WUY LUO KEFE HULA CROW YADEH MOW ANNAN SUONI KYLI HULU HUDEL YEHE GULAE YEHE BLU GELAN BOAT NIP POIT HELAK XINL BEAR LINB MAGEH MAGEJ WULI YIDE RIVE FISH AOGU DELIE MANTE KONMU DELU HELU HUAN HUMA DONGF JINCA HEDE DEFU LIBY JIAPA MEJI HELE BUHU MILK HABI THUN GARD DON YANGQ SANAQ BANQ LUJ PHIX SIEI EGG)
|
||||||
|
|
||||||
|
NUM1=$(fn-random-number ${#MOVES[@]})
|
||||||
|
NUM2=$(fn-random-number ${#MOVES[@]})
|
||||||
|
NUM3=$(fn-random-number ${#NAMES[@]})
|
||||||
|
|
||||||
UPPER_APPNAME="${MOVES[${NUM1}]}-${MOVES[${NUM2}]}-${NAMES[${NUM3}]}"
|
UPPER_APPNAME="${MOVES[${NUM1}]}-${MOVES[${NUM2}]}-${NAMES[${NUM3}]}"
|
||||||
|
|
||||||
@@ -27,82 +30,125 @@ random_name() {
|
|||||||
echo "$lower_appname"
|
echo "$lower_appname"
|
||||||
}
|
}
|
||||||
|
|
||||||
client_help_msg() {
|
fn-client-help-msg() {
|
||||||
echo "==> Configure the DOKKU_HOST environment variable or run $0 from a repository with a git remote named dokku"
|
echo "==> Configure the DOKKU_HOST environment variable or run $0 from a repository with a git remote named dokku" 1>&2
|
||||||
echo "--> i.e. git remote add dokku dokku@<dokku-host>:<app-name>"
|
echo "--> i.e. git remote add dokku dokku@<dokku-host>:<app-name>" 1>&2
|
||||||
exit 20 # exit with specific status. only used in units tests for now
|
exit 20 # exit with specific status. only used in units tests for now
|
||||||
}
|
}
|
||||||
|
|
||||||
is_git_repo() {
|
fn-is-git-repo() {
|
||||||
git rev-parse &>/dev/null
|
git rev-parse &>/dev/null
|
||||||
}
|
}
|
||||||
|
|
||||||
has_dokku_remote() {
|
fn-has-dokku-remote() {
|
||||||
git remote show | grep dokku
|
git remote show | grep -E "^${DOKKU_GIT_REMOTE}\s"
|
||||||
}
|
}
|
||||||
|
|
||||||
if [[ -z $DOKKU_HOST ]]; then
|
fn-dokku-host() {
|
||||||
|
declare DOKKU_GIT_REMOTE="$1" DOKKU_HOST="$2"
|
||||||
|
|
||||||
|
if [[ -z "$DOKKU_HOST" ]]; then
|
||||||
if [[ -d .git ]] || git rev-parse --git-dir > /dev/null 2>&1; then
|
if [[ -d .git ]] || git rev-parse --git-dir > /dev/null 2>&1; then
|
||||||
DOKKU_HOST=$(git remote -v 2>/dev/null | grep -Ei "^dokku" | head -n 1 | cut -f1 -d' ' | cut -f2 -d '@' | cut -f1 -d':' 2>/dev/null || true)
|
DOKKU_HOST=$(git remote -v 2>/dev/null | grep -Ei "^${DOKKU_GIT_REMOTE}\s" | head -n 1 | cut -f1 -d' ' | cut -f2 -d '@' | cut -f1 -d':' 2>/dev/null || true)
|
||||||
else
|
fi
|
||||||
client_help_msg
|
|
||||||
fi
|
fi
|
||||||
fi
|
|
||||||
|
|
||||||
export DOKKU_PORT=${DOKKU_PORT:=22}
|
if [[ -z "$DOKKU_HOST" ]]; then
|
||||||
|
fn-client-help-msg
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ ! -z $DOKKU_HOST ]]; then
|
echo "$DOKKU_HOST"
|
||||||
_dokku() {
|
}
|
||||||
appname=""
|
|
||||||
|
main() {
|
||||||
|
declare CMD="$1" APP_ARG="$2"
|
||||||
|
local APP="" DOKKU_GIT_REMOTE="dokku" DOKKU_REMOTE_HOST=""
|
||||||
|
local cmd_set=false arg_set="$2" next_index=1 skip=false args=("$@")
|
||||||
|
|
||||||
|
for arg in "$@"; do
|
||||||
|
if [[ "$skip" == "true" ]]; then
|
||||||
|
next_index=$(( next_index + 1 ))
|
||||||
|
skip=false
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
|
if [[ "$arg" == "--app" ]]; then
|
||||||
|
APP=${args[$next_index]}
|
||||||
|
skip=true
|
||||||
|
shift 2
|
||||||
|
elif [[ "$arg" == "--remote" ]]; then
|
||||||
|
DOKKU_GIT_REMOTE=${args[$next_index]}
|
||||||
|
skip=true
|
||||||
|
shift 2
|
||||||
|
elif [[ "$arg" =~ ^--.* ]]; then
|
||||||
|
[[ "$cmd_set" == "true" ]] && APP_ARG="$arg" && break
|
||||||
|
[[ "$arg" == "--trace" ]] && export DOKKU_TRACE=1 && set -x
|
||||||
|
else
|
||||||
|
if [[ "$cmd_set" == "true" ]]; then
|
||||||
|
APP_ARG="$arg"
|
||||||
|
break
|
||||||
|
else
|
||||||
|
CMD="$arg"
|
||||||
|
cmd_set=true
|
||||||
|
fi
|
||||||
|
fi
|
||||||
|
next_index=$(( next_index + 1 ))
|
||||||
|
done
|
||||||
|
|
||||||
|
DOKKU_REMOTE_HOST="$(fn-dokku-host "$DOKKU_GIT_REMOTE" "$DOKKU_HOST")"
|
||||||
|
|
||||||
|
if [[ -z "$APP" ]]; then
|
||||||
if [[ -d .git ]] || git rev-parse --git-dir > /dev/null 2>&1; then
|
if [[ -d .git ]] || git rev-parse --git-dir > /dev/null 2>&1; then
|
||||||
set +e
|
set +e
|
||||||
appname=$(git remote -v 2>/dev/null | grep -Ei "dokku@$DOKKU_HOST" | head -n 1 | cut -f2 -d'@' | cut -f1 -d' ' | cut -f2 -d':' 2>/dev/null)
|
APP=$(git remote -v 2>/dev/null | grep -Ei "dokku@$DOKKU_REMOTE_HOST" | head -n 1 | cut -f2 -d'@' | cut -f1 -d' ' | cut -f2 -d':' 2>/dev/null)
|
||||||
set -e
|
set -e
|
||||||
else
|
else
|
||||||
echo "This is not a git repository"
|
echo "This is not a git repository"
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
case "$1" in
|
case "$CMD" in
|
||||||
apps:create)
|
apps:create)
|
||||||
if [[ -z "$2" ]]; then
|
if [[ -z "$APP_ARG" ]]; then
|
||||||
appname=$(random_name)
|
APP=$(fn-random-name)
|
||||||
counter=0
|
counter=0
|
||||||
while ssh -p "$DOKKU_PORT" "dokku@$DOKKU_HOST" apps 2>/dev/null| grep -q "$appname"; do
|
while ssh -p "$DOKKU_PORT" "dokku@$DOKKU_REMOTE_HOST" apps 2>/dev/null| grep -q "$APP"; do
|
||||||
if [[ $counter -ge 100 ]]; then
|
if [[ $counter -ge 100 ]]; then
|
||||||
echo "Error: could not reasonably generate a new app name. try cleaning up some apps..."
|
echo "Error: could not reasonably generate a new app name. try cleaning up some apps..."
|
||||||
ssh -p "$DOKKU_PORT" "dokku@$DOKKU_HOST" apps
|
ssh -p "$DOKKU_PORT" "dokku@$DOKKU_REMOTE_HOST" apps
|
||||||
exit 1
|
exit 1
|
||||||
else
|
else
|
||||||
appname=$(random_name)
|
APP=$(random_name)
|
||||||
counter=$((counter+1))
|
counter=$((counter+1))
|
||||||
fi
|
fi
|
||||||
done
|
done
|
||||||
else
|
else
|
||||||
appname="$2"
|
APP="$APP_ARG"
|
||||||
fi
|
fi
|
||||||
if git remote add dokku "dokku@$DOKKU_HOST:$appname"; then
|
if git remote add dokku "dokku@$DOKKU_REMOTE_HOST:$APP"; then
|
||||||
echo "-----> Dokku remote added at $DOKKU_HOST"
|
echo "-----> Dokku remote added at ${DOKKU_REMOTE_HOST} called ${DOKKU_GIT_REMOTE}"
|
||||||
echo "-----> Application name is $appname"
|
echo "-----> Application name is ${APP}"
|
||||||
else
|
else
|
||||||
echo "! Dokku remote not added! Do you already have a dokku remote?"
|
echo "! Dokku remote not added! Do you already have a dokku remote?"
|
||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
;;
|
;;
|
||||||
apps:destroy)
|
apps:destroy)
|
||||||
is_git_repo && has_dokku_remote && git remote remove dokku
|
fn-is-git-repo && fn-has-dokku-remote && git remote remove "$DOKKU_GIT_REMOTE"
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
[[ -n "$@" ]] && [[ -n "$appname" ]] && app_arg="--app $appname"
|
[[ " apps certs help ls nginx shell storage trace version " == *" $CMD "* ]] && unset APP
|
||||||
# echo "ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_HOST -- $app_arg $@"
|
[[ " certs:chain domains:add-global domains:remove-global domains:set-global ps:rebuildall ps:restartall ps:restore " == *" $CMD "* ]] && unset APP
|
||||||
|
[[ "$CMD" =~ events*|plugin*|ssh-keys* ]] && unset APP
|
||||||
|
[[ -n "$APP_ARG" ]] && [[ "$APP_ARG" == "--global" ]] && unset APP
|
||||||
|
[[ -n "$@" ]] && [[ -n "$APP" ]] && app_arg="--app $APP"
|
||||||
|
# echo "ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_REMOTE_HOST -- $app_arg $@"
|
||||||
# shellcheck disable=SC2068,SC2086
|
# shellcheck disable=SC2068,SC2086
|
||||||
ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_HOST -- $app_arg $@
|
ssh -o LogLevel=QUIET -p $DOKKU_PORT -t dokku@$DOKKU_REMOTE_HOST -- $app_arg $@
|
||||||
}
|
}
|
||||||
|
|
||||||
if [[ "$0" == "dokku" ]] || [[ "$0" == *dokku_client.sh ]] || [[ "$0" == $(which dokku) ]]; then
|
if [[ "$0" == "dokku" ]] || [[ "$0" == *dokku_client.sh ]] || [[ "$0" == $(which dokku) ]]; then
|
||||||
_dokku "$@"
|
main "$@"
|
||||||
exit $?
|
exit $?
|
||||||
fi
|
|
||||||
else
|
|
||||||
client_help_msg
|
|
||||||
fi
|
fi
|
||||||
@@ -3,7 +3,7 @@
|
|||||||
> New as of 0.3.10
|
> New as of 0.3.10
|
||||||
|
|
||||||
```
|
```
|
||||||
domains [<app>] # List domains
|
domains [<app>|--global] # List domains
|
||||||
domains:add <app> <domain> [<domain> ...] # Add domains to app
|
domains:add <app> <domain> [<domain> ...] # Add domains to app
|
||||||
domains:add-global <domain> [<domain> ...] # Add global domain names
|
domains:add-global <domain> [<domain> ...] # Add global domain names
|
||||||
domains:clear <app> # Clear all domains for app
|
domains:clear <app> # Clear all domains for app
|
||||||
|
|||||||
@@ -35,10 +35,12 @@ source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
|
|||||||
|
|
||||||
parse_args "$@"
|
parse_args "$@"
|
||||||
args=("$@")
|
args=("$@")
|
||||||
|
skip_arg=false
|
||||||
if [[ "${args[0]}" =~ ^--.* ]]; then
|
if [[ "${args[0]}" =~ ^--.* ]]; then
|
||||||
for arg in "$@"; do
|
for arg in "$@"; do
|
||||||
|
$skip_arg && skip_arg=false && continue
|
||||||
if [[ "$arg" == "--app" ]]; then
|
if [[ "$arg" == "--app" ]]; then
|
||||||
shift 2
|
shift 2 && skip_arg=true
|
||||||
elif [[ "$arg" =~ ^--.* ]]; then
|
elif [[ "$arg" =~ ^--.* ]]; then
|
||||||
shift 1
|
shift 1
|
||||||
else
|
else
|
||||||
|
|||||||
@@ -251,7 +251,12 @@ parse_args() {
|
|||||||
declare desc="top-level cli arg parser"
|
declare desc="top-level cli arg parser"
|
||||||
local next_index=1; local skip=false; local args=("$@")
|
local next_index=1; local skip=false; local args=("$@")
|
||||||
for arg in "$@"; do
|
for arg in "$@"; do
|
||||||
$skip && skip=false && continue
|
if [[ "$skip" == "true" ]]; then
|
||||||
|
next_index=$(( next_index + 1 ))
|
||||||
|
skip=false
|
||||||
|
continue
|
||||||
|
fi
|
||||||
|
|
||||||
case "$arg" in
|
case "$arg" in
|
||||||
--quiet)
|
--quiet)
|
||||||
export DOKKU_QUIET_OUTPUT=1
|
export DOKKU_QUIET_OUTPUT=1
|
||||||
@@ -272,7 +277,7 @@ parse_args() {
|
|||||||
export DOKKU_APP_NAME=${args[$next_index]}; skip=true
|
export DOKKU_APP_NAME=${args[$next_index]}; skip=true
|
||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
local next_index=$(( next_index + 1 ))
|
next_index=$(( next_index + 1 ))
|
||||||
done
|
done
|
||||||
return 0
|
return 0
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -12,6 +12,11 @@ domains_main_cmd() {
|
|||||||
dokku_log_info2_quiet "Global Domain Name"
|
dokku_log_info2_quiet "Global Domain Name"
|
||||||
get_global_vhosts
|
get_global_vhosts
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
if [[ "$APP" == "--global" ]]; then
|
||||||
|
return
|
||||||
|
fi
|
||||||
|
|
||||||
if [[ -n "$APP" ]]; then
|
if [[ -n "$APP" ]]; then
|
||||||
verify_app_name "$APP"
|
verify_app_name "$APP"
|
||||||
if [[ -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
|
if [[ -f "$DOKKU_ROOT/$APP/VHOST" ]]; then
|
||||||
|
|||||||
Reference in new issue
Block a user