mirror of
https://github.com/gravitl/netmaker.git
synced 2024-09-21 07:46:04 +08:00
commit
e2e2b2b32d
|
@ -43,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.5"
|
||||
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"
|
||||
exit 1
|
||||
|
@ -210,11 +210,8 @@ configure_netclient() {
|
|||
# setup_nmctl - pulls nmctl and makes it executable
|
||||
setup_nmctl() {
|
||||
|
||||
# DEV_TEMP - Temporary instructions for testing
|
||||
wget -O /usr/bin/nmctl https://fileserver.netmaker.org/testing/nmctl
|
||||
wget -O /usr/bin/nmctl https://github.com/gravitl/netmaker/releases/download/$LATEST/nmctl_linux_amd64
|
||||
|
||||
# RELEASE_REPLACE - Use this once release is ready
|
||||
# wget https://github.com/gravitl/netmaker/releases/download/v0.17.1/nmctl
|
||||
chmod +x /usr/bin/nmctl
|
||||
echo "using server api.$NETMAKER_BASE_DOMAIN"
|
||||
echo "using master key $MASTER_KEY"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/bin/bash
|
||||
|
||||
LATEST="testing"
|
||||
LATEST="v0.18.5"
|
||||
|
||||
# check_version - make sure current version is 0.17.1 before continuing
|
||||
check_version() {
|
||||
|
@ -337,17 +337,11 @@ set_compose() {
|
|||
rm /root/wait.sh
|
||||
rm /root/mosquitto.conf
|
||||
|
||||
# DEV_TEMP
|
||||
wget -O /root/wait.sh https://raw.githubusercontent.com/gravitl/netmaker/develop/docker/wait.sh
|
||||
# RELEASE_REPLACE - Use this once release is ready
|
||||
# wget -O /root/wait.sh https://raw.githubusercontent.com/gravitl/netmaker/master/docker/wait.sh
|
||||
wget -O /root/wait.sh https://raw.githubusercontent.com/gravitl/netmaker/master/docker/wait.sh
|
||||
|
||||
chmod +x /root/wait.sh
|
||||
|
||||
# DEV_TEMP
|
||||
wget -O /root/mosquitto.conf https://raw.githubusercontent.com/gravitl/netmaker/develop/docker/mosquitto.conf
|
||||
# RELEASE_REPLACE - Use this once release is ready
|
||||
# wget -O /root/wait.sh https://raw.githubusercontent.com/gravitl/netmaker/master/docker/wait.sh
|
||||
wget -O /root/mosquitto.conf https://raw.githubusercontent.com/gravitl/netmaker/master/docker/mosquitto.conf
|
||||
|
||||
chmod +x /root/mosquitto.conf
|
||||
|
||||
|
@ -431,7 +425,7 @@ setup_netclient() {
|
|||
netclient uninstall
|
||||
set -e
|
||||
|
||||
wget -O /tmp/netclient https://fileserver.netmaker.org/$LATEST/netclient
|
||||
wget -O /tmp/netclient https://github.com/gravitl/netclient/releases/download/$LATEST/netclient_linux_amd64
|
||||
|
||||
chmod +x /tmp/netclient
|
||||
/tmp/netclient install
|
||||
|
@ -446,11 +440,8 @@ setup_netclient() {
|
|||
# setup_nmctl - pulls nmctl and makes it executable
|
||||
setup_nmctl() {
|
||||
|
||||
# DEV_TEMP - Temporary instructions for testing
|
||||
wget https://fileserver.netmaker.org/testing/nmctl
|
||||
|
||||
# RELEASE_REPLACE - Use this once release is ready
|
||||
# wget https://github.com/gravitl/netmaker/releases/download/v0.17.1/nmctl
|
||||
wget -O nmctl https://github.com/gravitl/netmaker/releases/download/$LATEST/nmctl_linux_amd64
|
||||
|
||||
chmod +x nmctl
|
||||
echo "using server $SERVER_HTTP_HOST"
|
||||
echo "using master key $MASTER_KEY"
|
||||
|
|
Loading…
Reference in a new issue