zishuo/netmaker
1
0
Fork 0
mirror of https://github.com/gravitl/netmaker.git synced 2025-11-03 00:54:00 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' into story/GRA-1252

Browse Source
This commit is contained in:
Alex Feiszli
2023-03-07 14:09:26 -05:00
committed by GitHub
parent 26182eeab8 f651e65eff
commit 6a89c81e01
41 changed files with 959 additions and 576 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
scripts/nm-quick.sh
View File

@@ -1,6 +1,25 @@
#!/bin/bash
LATEST="v0.18.1"
LATEST="v0.18.3"
print_logo() {(
cat << "EOF"
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
__ __ ______ ______ __ __ ______ __ __ ______ ______
/\ "-.\ \ /\ ___\ /\__ _\ /\ "-./ \ /\ __ \ /\ \/ / /\ ___\ /\ == \
\ \ \-. \ \ \ __\ \/_/\ \/ \ \ \-./\ \ \ \ __ \ \ \ _"-. \ \ __\ \ \ __<
\ \_\\"\_\ \ \_____\ \ \_\ \ \_\ \ \_\ \ \_\ \_\ \ \_\ \_\ \ \_____\ \ \_\ \_\
\/_/ \/_/ \/_____/ \/_/ \/_/ \/_/ \/_/\/_/ \/_/\/_/ \/_____/ \/_/ /_/
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EOF
)}
if [ $(id -u) -ne 0 ]; then
echo "This script must be run as root"
@@ -24,7 +43,7 @@ usage () {
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 "examples:"
echo " nm-quick.sh -e -b version -t v0.18.2"
echo " nm-quick.sh -e -b version -t v0.18.3"
echo " nm-quick.sh -e -b local -t feature_v0.17.2_newfeature"
echo " nm-quick.sh -e -b branch -t develop"
exit 1

8
scripts/nm-upgrade.sh
View File

@@ -202,7 +202,7 @@ collect_server_settings() {
STUN_NAME="stun.$SERVER_NAME"
echo "-----------------------------------------------------"
echo "Netmaker v0.18.2 requires a new DNS entry for $STUN_NAME."
echo "Netmaker v0.18.3 requires a new DNS entry for $STUN_NAME."
echo "Please confirm this is added to your DNS provider before continuing"
echo "(note: this is not required if using an nip.io address)"
echo "-----------------------------------------------------"
@@ -260,7 +260,7 @@ set_compose() {
sed -i "s/v0.17.1/testing/g" /root/docker-compose.yml
# RELEASE_REPLACE - Use this once release is ready
#sed -i "s/v0.17.1/v0.18.2/g" /root/docker-compose.yml
#sed -i "s/v0.17.1/v0.18.3/g" /root/docker-compose.yml
yq ".services.netmaker.environment.SERVER_NAME = \"$SERVER_NAME\"" -i /root/docker-compose.yml
yq ".services.netmaker.environment += {\"BROKER_NAME\": \"$BROKER_NAME\"}" -i /root/docker-compose.yml
yq ".services.netmaker.environment += {\"STUN_NAME\": \"$STUN_NAME\"}" -i /root/docker-compose.yml
@@ -431,7 +431,7 @@ join_networks() {
# create an egress if necessary
if [[ $HAS_EGRESS == "yes" ]]; then
echo "Egress is currently unimplemented. Wait for 0.18.2"
echo "Egress is currently unimplemented. Wait for 0.18.3"
fi
echo "HAS INGRESS: $HAS_INGRESS"
@@ -462,7 +462,7 @@ join_networks() {
cat << "EOF"
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
The Netmaker Upgrade Script: Upgrading to v0.18.2 so you don't have to!
The Netmaker Upgrade Script: Upgrading to v0.18.3 so you don't have to!
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
EOF