diff --git a/.devcontainer/api.dockerfile b/.devcontainer/api.dockerfile index 8a753fd7..7241c1fb 100644 --- a/.devcontainer/api.dockerfile +++ b/.devcontainer/api.dockerfile @@ -1,11 +1,11 @@ # pulls community scripts from git repo -FROM python:3.10.8-slim AS GET_SCRIPTS_STAGE +FROM python:3.11.2-slim AS GET_SCRIPTS_STAGE RUN apt-get update && \ apt-get install -y --no-install-recommends git && \ git clone https://github.com/amidaware/community-scripts.git /community-scripts -FROM python:3.10.8-slim +FROM python:3.11.2-slim ENV TACTICAL_DIR /opt/tactical ENV TACTICAL_READY_FILE ${TACTICAL_DIR}/tmp/tactical.ready diff --git a/.github/workflows/ci-tests.yml b/.github/workflows/ci-tests.yml index 3ffa1d5d..53542765 100644 --- a/.github/workflows/ci-tests.yml +++ b/.github/workflows/ci-tests.yml @@ -14,7 +14,7 @@ jobs: name: Tests strategy: matrix: - python-version: ["3.10.8", "3.11.2"] + python-version: ["3.11.2"] steps: - uses: actions/checkout@v3 diff --git a/api/tacticalrmm/requirements.txt b/api/tacticalrmm/requirements.txt index 19d7bee9..75b95266 100644 --- a/api/tacticalrmm/requirements.txt +++ b/api/tacticalrmm/requirements.txt @@ -13,7 +13,7 @@ django-cors-headers==3.14.0 django-ipware==5.0.0 django-rest-knox==4.2.0 djangorestframework==3.14.0 -drf-spectacular==0.26.0 +drf-spectacular==0.26.1 hiredis==2.2.2 meshctrl==0.1.15 msgpack==1.0.5 @@ -32,7 +32,7 @@ requests==2.28.2 six==1.16.0 sqlparse==0.4.3 twilio==7.16.5 -urllib3==1.26.14 +urllib3==1.26.15 uWSGI==2.0.21 validators==0.20.0 vine==5.0.0 diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index cdb14427..9189d722 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -23,14 +23,14 @@ AUTH_USER_MODEL = "accounts.User" TRMM_VERSION = "0.15.8-dev" # https://github.com/amidaware/tacticalrmm-web -WEB_VERSION = "0.101.13" +WEB_VERSION = "0.101.14-dev" # bump this version everytime vue code is changed # to alert user they need to manually refresh their browser -APP_VER = "0.0.177" +APP_VER = "0.0.178" # https://github.com/amidaware/rmmagent -LATEST_AGENT_VER = "2.4.4" +LATEST_AGENT_VER = "2.4.5-dev" MESH_VER = "1.1.4" @@ -40,7 +40,7 @@ NATS_SERVER_VER = "2.9.15" PIP_VER = "35" SETUPTOOLS_VER = "67.6.0" -WHEEL_VER = "0.38.4" +WHEEL_VER = "0.40.0" AGENT_BASE_URL = "https://agents.tacticalrmm.com" CHECK_TOKEN_URL = f"{AGENT_BASE_URL}/api/v2/checktoken" diff --git a/docker/containers/tactical/dockerfile b/docker/containers/tactical/dockerfile index fe177eae..fd89cc01 100644 --- a/docker/containers/tactical/dockerfile +++ b/docker/containers/tactical/dockerfile @@ -1,5 +1,5 @@ # creates python virtual env -FROM python:3.10.8-slim AS CREATE_VENV_STAGE +FROM python:3.11.2-slim AS CREATE_VENV_STAGE ARG DEBIAN_FRONTEND=noninteractive @@ -21,14 +21,14 @@ RUN apt-get update && \ pip install --no-cache-dir -r ${TACTICAL_TMP_DIR}/api/requirements.txt # pulls community scripts from git repo -FROM python:3.10.8-slim AS GET_SCRIPTS_STAGE +FROM python:3.11.2-slim AS GET_SCRIPTS_STAGE RUN apt-get update && \ apt-get install -y --no-install-recommends git && \ git clone https://github.com/amidaware/community-scripts.git /community-scripts # runtime image -FROM python:3.10.8-slim +FROM python:3.11.2-slim # set env variables ENV VIRTUAL_ENV /opt/venv diff --git a/go.mod b/go.mod index 75320363..b3fc4b51 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,6 @@ module github.com/amidaware/tacticalrmm -go 1.19 +go 1.20 require ( github.com/golang/protobuf v1.5.2 // indirect diff --git a/install.sh b/install.sh index efa5aca1..0119703e 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_VERSION="71" +SCRIPT_VERSION="72" SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/install.sh' sudo apt install -y curl wget dirmngr gnupg lsb-release @@ -12,7 +12,7 @@ RED='\033[0;31m' NC='\033[0m' SCRIPTS_DIR='/opt/trmm-community-scripts' -PYTHON_VER='3.10.8' +PYTHON_VER='3.11.2' SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py' TMP_FILE=$(mktemp -p "" "rmminstall_XXXXXXXXXX") @@ -414,7 +414,7 @@ SETUPTOOLS_VER=$(grep "^SETUPTOOLS_VER" "$SETTINGS_FILE" | awk -F'[= "]' '{print WHEEL_VER=$(grep "^WHEEL_VER" "$SETTINGS_FILE" | awk -F'[= "]' '{print $5}') cd /rmm/api -python3.10 -m venv env +python3.11 -m venv env source /rmm/api/env/bin/activate cd /rmm/api/tacticalrmm pip install --no-cache-dir --upgrade pip diff --git a/main.go b/main.go index 06e62194..1bd84b4c 100644 --- a/main.go +++ b/main.go @@ -12,7 +12,7 @@ import ( ) var ( - version = "3.4.2" + version = "3.4.3" log = logrus.New() ) diff --git a/natsapi/bin/nats-api b/natsapi/bin/nats-api index f844ce1c..104ed0bc 100755 Binary files a/natsapi/bin/nats-api and b/natsapi/bin/nats-api differ diff --git a/restore.sh b/restore.sh index 006f01c9..2cc74e3a 100755 --- a/restore.sh +++ b/restore.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_VERSION="46" +SCRIPT_VERSION="47" SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/restore.sh' sudo apt update @@ -13,7 +13,7 @@ RED='\033[0;31m' NC='\033[0m' SCRIPTS_DIR='/opt/trmm-community-scripts' -PYTHON_VER='3.10.8' +PYTHON_VER='3.11.2' SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py' TMP_FILE=$(mktemp -p "" "rmmrestore_XXXXXXXXXX") @@ -338,7 +338,7 @@ SETUPTOOLS_VER=$(grep "^SETUPTOOLS_VER" "$SETTINGS_FILE" | awk -F'[= "]' '{print WHEEL_VER=$(grep "^WHEEL_VER" "$SETTINGS_FILE" | awk -F'[= "]' '{print $5}') cd /rmm/api -python3.10 -m venv env +python3.11 -m venv env source /rmm/api/env/bin/activate cd /rmm/api/tacticalrmm pip install --no-cache-dir --upgrade pip diff --git a/update.sh b/update.sh index 098d1c6b..290805cf 100644 --- a/update.sh +++ b/update.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_VERSION="141" +SCRIPT_VERSION="142" SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/update.sh' LATEST_SETTINGS_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/api/tacticalrmm/tacticalrmm/settings.py' YELLOW='\033[1;33m' @@ -10,7 +10,7 @@ NC='\033[0m' THIS_SCRIPT=$(readlink -f "$0") SCRIPTS_DIR='/opt/trmm-community-scripts' -PYTHON_VER='3.10.8' +PYTHON_VER='3.11.2' SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py' TMP_FILE=$(mktemp -p "" "rmmupdate_XXXXXXXXXX") @@ -209,8 +209,8 @@ if ! sudo nginx -t > /dev/null 2>&1; then exit 1 fi -HAS_PY310=$(python3.10 --version | grep ${PYTHON_VER}) -if ! [[ $HAS_PY310 ]]; then +HAS_PY311=$(python3.11 --version | grep ${PYTHON_VER}) +if ! [[ $HAS_PY311 ]]; then printf >&2 "${GREEN}Updating to ${PYTHON_VER}${NC}\n" sudo apt install -y build-essential zlib1g-dev libncurses5-dev libgdbm-dev libnss3-dev libssl-dev libreadline-dev libffi-dev libsqlite3-dev libbz2-dev numprocs=$(nproc) @@ -330,7 +330,7 @@ sudo chmod +x /usr/local/bin/nats-api if [[ "${CURRENT_PIP_VER}" != "${LATEST_PIP_VER}" ]] || [[ "$force" = true ]]; then rm -rf /rmm/api/env cd /rmm/api - python3.10 -m venv env + python3.11 -m venv env source /rmm/api/env/bin/activate cd /rmm/api/tacticalrmm pip install --no-cache-dir --upgrade pip