diff --git a/docker/containers/tactical-nats/dockerfile b/docker/containers/tactical-nats/dockerfile index bd0d69c7..4e4cda8b 100644 --- a/docker/containers/tactical-nats/dockerfile +++ b/docker/containers/tactical-nats/dockerfile @@ -1,4 +1,4 @@ -FROM nats:2.1-alpine +FROM nats:2.2-alpine ENV TACTICAL_DIR /opt/tactical ENV TACTICAL_READY_FILE ${TACTICAL_DIR}/tmp/tactical.ready diff --git a/install.sh b/install.sh index d1efb06b..3e368166 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION="42" +SCRIPT_VERSION="43" SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/install.sh' sudo apt install -y curl wget dirmngr gnupg lsb-release @@ -185,9 +185,9 @@ print_green 'Installing golang' sudo mkdir -p /usr/local/rmmgo go_tmp=$(mktemp -d -t rmmgo-XXXXXXXXXX) -wget https://golang.org/dl/go1.16.linux-amd64.tar.gz -P ${go_tmp} +wget https://golang.org/dl/go1.16.2.linux-amd64.tar.gz -P ${go_tmp} -tar -xzf ${go_tmp}/go1.16.linux-amd64.tar.gz -C ${go_tmp} +tar -xzf ${go_tmp}/go1.16.2.linux-amd64.tar.gz -C ${go_tmp} sudo mv ${go_tmp}/go /usr/local/rmmgo/ rm -rf ${go_tmp} @@ -195,11 +195,11 @@ rm -rf ${go_tmp} print_green 'Downloading NATS' nats_tmp=$(mktemp -d -t nats-XXXXXXXXXX) -wget https://github.com/nats-io/nats-server/releases/download/v2.1.9/nats-server-v2.1.9-linux-amd64.tar.gz -P ${nats_tmp} +wget https://github.com/nats-io/nats-server/releases/download/v2.2.0/nats-server-v2.2.0-linux-amd64.tar.gz -P ${nats_tmp} -tar -xzf ${nats_tmp}/nats-server-v2.1.9-linux-amd64.tar.gz -C ${nats_tmp} +tar -xzf ${nats_tmp}/nats-server-v2.2.0-linux-amd64.tar.gz -C ${nats_tmp} -sudo mv ${nats_tmp}/nats-server-v2.1.9-linux-amd64/nats-server /usr/local/bin/ +sudo mv ${nats_tmp}/nats-server-v2.2.0-linux-amd64/nats-server /usr/local/bin/ sudo chmod +x /usr/local/bin/nats-server sudo chown ${USER}:${USER} /usr/local/bin/nats-server rm -rf ${nats_tmp} diff --git a/restore.sh b/restore.sh index 40f81514..d757e63e 100755 --- a/restore.sh +++ b/restore.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION="20" +SCRIPT_VERSION="21" SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/restore.sh' sudo apt update @@ -108,9 +108,9 @@ print_green 'Installing golang' sudo apt update sudo mkdir -p /usr/local/rmmgo go_tmp=$(mktemp -d -t rmmgo-XXXXXXXXXX) -wget https://golang.org/dl/go1.16.linux-amd64.tar.gz -P ${go_tmp} +wget https://golang.org/dl/go1.16.2.linux-amd64.tar.gz -P ${go_tmp} -tar -xzf ${go_tmp}/go1.16.linux-amd64.tar.gz -C ${go_tmp} +tar -xzf ${go_tmp}/go1.16.2.linux-amd64.tar.gz -C ${go_tmp} sudo mv ${go_tmp}/go /usr/local/rmmgo/ rm -rf ${go_tmp} @@ -118,11 +118,11 @@ rm -rf ${go_tmp} print_green 'Downloading NATS' nats_tmp=$(mktemp -d -t nats-XXXXXXXXXX) -wget https://github.com/nats-io/nats-server/releases/download/v2.1.9/nats-server-v2.1.9-linux-amd64.tar.gz -P ${nats_tmp} +wget https://github.com/nats-io/nats-server/releases/download/v2.2.0/nats-server-v2.2.0-linux-amd64.tar.gz -P ${nats_tmp} -tar -xzf ${nats_tmp}/nats-server-v2.1.9-linux-amd64.tar.gz -C ${nats_tmp} +tar -xzf ${nats_tmp}/nats-server-v2.2.0-linux-amd64.tar.gz -C ${nats_tmp} -sudo mv ${nats_tmp}/nats-server-v2.1.9-linux-amd64/nats-server /usr/local/bin/ +sudo mv ${nats_tmp}/nats-server-v2.2.0-linux-amd64/nats-server /usr/local/bin/ sudo chmod +x /usr/local/bin/nats-server sudo chown ${USER}:${USER} /usr/local/bin/nats-server rm -rf ${nats_tmp} diff --git a/update.sh b/update.sh index b83885e3..ac8d4c62 100644 --- a/update.sh +++ b/update.sh @@ -1,6 +1,6 @@ #!/bin/bash -SCRIPT_VERSION="113" +SCRIPT_VERSION="114" SCRIPT_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/update.sh' LATEST_SETTINGS_URL='https://raw.githubusercontent.com/wh1te909/tacticalrmm/master/api/tacticalrmm/tacticalrmm/settings.py' YELLOW='\033[1;33m' @@ -242,6 +242,19 @@ if ! [[ $HAS_PY39 ]]; then sudo rm -rf Python-3.9.2 Python-3.9.2.tgz fi +HAS_NATS220=$(/usr/local/bin/nats-server -version | grep v2.2.0) +if ! [[ $HAS_NATS220 ]]; then + printf >&2 "${GREEN}Updating nats to v2.2.0${NC}\n" + nats_tmp=$(mktemp -d -t nats-XXXXXXXXXX) + wget https://github.com/nats-io/nats-server/releases/download/v2.2.0/nats-server-v2.2.0-linux-amd64.tar.gz -P ${nats_tmp} + tar -xzf ${nats_tmp}/nats-server-v2.2.0-linux-amd64.tar.gz -C ${nats_tmp} + sudo rm -f /usr/local/bin/nats-server + sudo mv ${nats_tmp}/nats-server-v2.2.0-linux-amd64/nats-server /usr/local/bin/ + sudo chmod +x /usr/local/bin/nats-server + sudo chown ${USER}:${USER} /usr/local/bin/nats-server + rm -rf ${nats_tmp} +fi + cd /rmm git config user.email "admin@example.com" git config user.name "Bob"