mirror of
https://github.com/gravitl/netmaker.git
synced 2024-11-10 09:32:32 +08:00
add domain flag to nm-quick (#2416)
This commit is contained in:
parent
5950ded7ed
commit
6e39ae4178
1 changed files with 12 additions and 5 deletions
|
@ -4,7 +4,7 @@ CONFIG_FILE=netmaker.env
|
|||
# location of nm-quick.sh (usually `/root`)
|
||||
SCRIPT_DIR=$(dirname "$(realpath "$0")")
|
||||
CONFIG_PATH="$SCRIPT_DIR/$CONFIG_FILE"
|
||||
NM_QUICK_VERSION="0.1.0"
|
||||
NM_QUICK_VERSION="0.1.1"
|
||||
LATEST=$(curl -s https://api.github.com/repos/gravitl/netmaker/releases/latest | grep "tag_name" | cut -d : -f 2,3 | tr -d [:space:],\")
|
||||
|
||||
if [ $(id -u) -ne 0 ]; then
|
||||
|
@ -17,11 +17,12 @@ unset BUILD_TYPE
|
|||
unset BUILD_TAG
|
||||
unset IMAGE_TAG
|
||||
unset AUTO_BUILD
|
||||
unset NETMAKER_BASE_DOMAIN
|
||||
|
||||
# usage - displays usage instructions
|
||||
usage() {
|
||||
echo "nm-quick.sh v$NM_QUICK_VERSION"
|
||||
echo "usage: ./nm-quick.sh [-e] [-b buildtype] [-t tag] [-a auto]"
|
||||
echo "usage: ./nm-quick.sh [-e] [-b buildtype] [-t tag] [-a auto] [-d domain]"
|
||||
echo " -e if specified, will install netmaker EE"
|
||||
echo " -b type of build; options:"
|
||||
echo " \"version\" - will install a specific version of Netmaker using remote git and dockerhub"
|
||||
|
@ -29,14 +30,16 @@ usage() {
|
|||
echo " \"branch\": - will install a specific branch using remote git and dockerhub"
|
||||
echo " -t tag of build; if buildtype=version, tag=version. If builtype=branch or builtype=local, tag=branch"
|
||||
echo " -a auto-build; skip prompts and use defaults, if none provided"
|
||||
echo " -d domain; if specified, will use this domain instead of auto-generating one"
|
||||
echo "examples:"
|
||||
echo " nm-quick.sh -e -b version -t $LATEST"
|
||||
echo " nm-quick.sh -e -b local -t feature_v0.17.2_newfeature"
|
||||
echo " nm-quick.sh -e -b branch -t develop"
|
||||
echo " nm-quick.sh -e -b version -t $LATEST -a -d example.com"
|
||||
exit 1
|
||||
}
|
||||
|
||||
while getopts evab:t: flag; do
|
||||
while getopts evab:d:t: flag; do
|
||||
case "${flag}" in
|
||||
e)
|
||||
INSTALL_TYPE="ee"
|
||||
|
@ -60,6 +63,9 @@ while getopts evab:t: flag; do
|
|||
t)
|
||||
BUILD_TAG=${OPTARG}
|
||||
;;
|
||||
d)
|
||||
NETMAKER_BASE_DOMAIN=${OPTARG}
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
|
@ -490,8 +496,9 @@ set_install_vars() {
|
|||
if [ "$IP_ADDR" = "" ]; then
|
||||
IP_ADDR=$(curl -s ifconfig.me)
|
||||
fi
|
||||
|
||||
NETMAKER_BASE_DOMAIN=nm.$(echo $IP_ADDR | tr . -).nip.io
|
||||
if [ "$NETMAKER_BASE_DOMAIN" = "" ]; then
|
||||
NETMAKER_BASE_DOMAIN=nm.$(echo $IP_ADDR | tr . -).nip.io
|
||||
fi
|
||||
SERVER_HOST=$IP_ADDR
|
||||
if test -z "$MASTER_KEY"; then
|
||||
MASTER_KEY=$(
|
||||
|
|
Loading…
Reference in a new issue