update reqs and python3.11
This commit is contained in:
		@@ -1,11 +1,11 @@
 | 
				
			|||||||
# pulls community scripts from git repo
 | 
					# 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 && \
 | 
					RUN apt-get update && \
 | 
				
			||||||
    apt-get install -y --no-install-recommends git && \
 | 
					    apt-get install -y --no-install-recommends git && \
 | 
				
			||||||
    git clone https://github.com/amidaware/community-scripts.git /community-scripts
 | 
					    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_DIR /opt/tactical
 | 
				
			||||||
ENV TACTICAL_READY_FILE ${TACTICAL_DIR}/tmp/tactical.ready
 | 
					ENV TACTICAL_READY_FILE ${TACTICAL_DIR}/tmp/tactical.ready
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								.github/workflows/ci-tests.yml
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										2
									
								
								.github/workflows/ci-tests.yml
									
									
									
									
										vendored
									
									
								
							@@ -14,7 +14,7 @@ jobs:
 | 
				
			|||||||
    name: Tests
 | 
					    name: Tests
 | 
				
			||||||
    strategy:
 | 
					    strategy:
 | 
				
			||||||
      matrix:
 | 
					      matrix:
 | 
				
			||||||
        python-version: ["3.10.8", "3.11.2"]
 | 
					        python-version: ["3.11.2"]
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    steps:
 | 
					    steps:
 | 
				
			||||||
      - uses: actions/checkout@v3
 | 
					      - uses: actions/checkout@v3
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -13,7 +13,7 @@ django-cors-headers==3.14.0
 | 
				
			|||||||
django-ipware==5.0.0
 | 
					django-ipware==5.0.0
 | 
				
			||||||
django-rest-knox==4.2.0
 | 
					django-rest-knox==4.2.0
 | 
				
			||||||
djangorestframework==3.14.0
 | 
					djangorestframework==3.14.0
 | 
				
			||||||
drf-spectacular==0.26.0
 | 
					drf-spectacular==0.26.1
 | 
				
			||||||
hiredis==2.2.2
 | 
					hiredis==2.2.2
 | 
				
			||||||
meshctrl==0.1.15
 | 
					meshctrl==0.1.15
 | 
				
			||||||
msgpack==1.0.5
 | 
					msgpack==1.0.5
 | 
				
			||||||
@@ -32,7 +32,7 @@ requests==2.28.2
 | 
				
			|||||||
six==1.16.0
 | 
					six==1.16.0
 | 
				
			||||||
sqlparse==0.4.3
 | 
					sqlparse==0.4.3
 | 
				
			||||||
twilio==7.16.5
 | 
					twilio==7.16.5
 | 
				
			||||||
urllib3==1.26.14
 | 
					urllib3==1.26.15
 | 
				
			||||||
uWSGI==2.0.21
 | 
					uWSGI==2.0.21
 | 
				
			||||||
validators==0.20.0
 | 
					validators==0.20.0
 | 
				
			||||||
vine==5.0.0
 | 
					vine==5.0.0
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -23,14 +23,14 @@ AUTH_USER_MODEL = "accounts.User"
 | 
				
			|||||||
TRMM_VERSION = "0.15.8-dev"
 | 
					TRMM_VERSION = "0.15.8-dev"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# https://github.com/amidaware/tacticalrmm-web
 | 
					# 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
 | 
					# bump this version everytime vue code is changed
 | 
				
			||||||
# to alert user they need to manually refresh their browser
 | 
					# 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
 | 
					# https://github.com/amidaware/rmmagent
 | 
				
			||||||
LATEST_AGENT_VER = "2.4.4"
 | 
					LATEST_AGENT_VER = "2.4.5-dev"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
MESH_VER = "1.1.4"
 | 
					MESH_VER = "1.1.4"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -40,7 +40,7 @@ NATS_SERVER_VER = "2.9.15"
 | 
				
			|||||||
PIP_VER = "35"
 | 
					PIP_VER = "35"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SETUPTOOLS_VER = "67.6.0"
 | 
					SETUPTOOLS_VER = "67.6.0"
 | 
				
			||||||
WHEEL_VER = "0.38.4"
 | 
					WHEEL_VER = "0.40.0"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
AGENT_BASE_URL = "https://agents.tacticalrmm.com"
 | 
					AGENT_BASE_URL = "https://agents.tacticalrmm.com"
 | 
				
			||||||
CHECK_TOKEN_URL = f"{AGENT_BASE_URL}/api/v2/checktoken"
 | 
					CHECK_TOKEN_URL = f"{AGENT_BASE_URL}/api/v2/checktoken"
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,5 +1,5 @@
 | 
				
			|||||||
# creates python virtual env
 | 
					# 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
 | 
					ARG DEBIAN_FRONTEND=noninteractive
 | 
				
			||||||
 | 
					
 | 
				
			||||||
@@ -21,14 +21,14 @@ RUN apt-get update && \
 | 
				
			|||||||
    pip install --no-cache-dir -r ${TACTICAL_TMP_DIR}/api/requirements.txt
 | 
					    pip install --no-cache-dir -r ${TACTICAL_TMP_DIR}/api/requirements.txt
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# pulls community scripts from git repo
 | 
					# 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 && \
 | 
					RUN apt-get update && \
 | 
				
			||||||
    apt-get install -y --no-install-recommends git && \
 | 
					    apt-get install -y --no-install-recommends git && \
 | 
				
			||||||
    git clone https://github.com/amidaware/community-scripts.git /community-scripts
 | 
					    git clone https://github.com/amidaware/community-scripts.git /community-scripts
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# runtime image
 | 
					# runtime image
 | 
				
			||||||
FROM python:3.10.8-slim
 | 
					FROM python:3.11.2-slim
 | 
				
			||||||
 | 
					
 | 
				
			||||||
# set env variables
 | 
					# set env variables
 | 
				
			||||||
ENV VIRTUAL_ENV /opt/venv
 | 
					ENV VIRTUAL_ENV /opt/venv
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								go.mod
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								go.mod
									
									
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
module github.com/amidaware/tacticalrmm
 | 
					module github.com/amidaware/tacticalrmm
 | 
				
			||||||
 | 
					
 | 
				
			||||||
go 1.19
 | 
					go 1.20
 | 
				
			||||||
 | 
					
 | 
				
			||||||
require (
 | 
					require (
 | 
				
			||||||
	github.com/golang/protobuf v1.5.2 // indirect
 | 
						github.com/golang/protobuf v1.5.2 // indirect
 | 
				
			||||||
 
 | 
				
			|||||||
@@ -1,6 +1,6 @@
 | 
				
			|||||||
#!/usr/bin/env bash
 | 
					#!/usr/bin/env bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SCRIPT_VERSION="71"
 | 
					SCRIPT_VERSION="72"
 | 
				
			||||||
SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/install.sh'
 | 
					SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/install.sh'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
sudo apt install -y curl wget dirmngr gnupg lsb-release
 | 
					sudo apt install -y curl wget dirmngr gnupg lsb-release
 | 
				
			||||||
@@ -12,7 +12,7 @@ RED='\033[0;31m'
 | 
				
			|||||||
NC='\033[0m'
 | 
					NC='\033[0m'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SCRIPTS_DIR='/opt/trmm-community-scripts'
 | 
					SCRIPTS_DIR='/opt/trmm-community-scripts'
 | 
				
			||||||
PYTHON_VER='3.10.8'
 | 
					PYTHON_VER='3.11.2'
 | 
				
			||||||
SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py'
 | 
					SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TMP_FILE=$(mktemp -p "" "rmminstall_XXXXXXXXXX")
 | 
					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}')
 | 
					WHEEL_VER=$(grep "^WHEEL_VER" "$SETTINGS_FILE" | awk -F'[= "]' '{print $5}')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cd /rmm/api
 | 
					cd /rmm/api
 | 
				
			||||||
python3.10 -m venv env
 | 
					python3.11 -m venv env
 | 
				
			||||||
source /rmm/api/env/bin/activate
 | 
					source /rmm/api/env/bin/activate
 | 
				
			||||||
cd /rmm/api/tacticalrmm
 | 
					cd /rmm/api/tacticalrmm
 | 
				
			||||||
pip install --no-cache-dir --upgrade pip
 | 
					pip install --no-cache-dir --upgrade pip
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										2
									
								
								main.go
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								main.go
									
									
									
									
									
								
							@@ -12,7 +12,7 @@ import (
 | 
				
			|||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
var (
 | 
					var (
 | 
				
			||||||
	version = "3.4.2"
 | 
						version = "3.4.3"
 | 
				
			||||||
	log     = logrus.New()
 | 
						log     = logrus.New()
 | 
				
			||||||
)
 | 
					)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 
 | 
				
			|||||||
										
											Binary file not shown.
										
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
#!/usr/bin/env bash
 | 
					#!/usr/bin/env bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SCRIPT_VERSION="46"
 | 
					SCRIPT_VERSION="47"
 | 
				
			||||||
SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/restore.sh'
 | 
					SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/restore.sh'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
sudo apt update
 | 
					sudo apt update
 | 
				
			||||||
@@ -13,7 +13,7 @@ RED='\033[0;31m'
 | 
				
			|||||||
NC='\033[0m'
 | 
					NC='\033[0m'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SCRIPTS_DIR='/opt/trmm-community-scripts'
 | 
					SCRIPTS_DIR='/opt/trmm-community-scripts'
 | 
				
			||||||
PYTHON_VER='3.10.8'
 | 
					PYTHON_VER='3.11.2'
 | 
				
			||||||
SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py'
 | 
					SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TMP_FILE=$(mktemp -p "" "rmmrestore_XXXXXXXXXX")
 | 
					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}')
 | 
					WHEEL_VER=$(grep "^WHEEL_VER" "$SETTINGS_FILE" | awk -F'[= "]' '{print $5}')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
cd /rmm/api
 | 
					cd /rmm/api
 | 
				
			||||||
python3.10 -m venv env
 | 
					python3.11 -m venv env
 | 
				
			||||||
source /rmm/api/env/bin/activate
 | 
					source /rmm/api/env/bin/activate
 | 
				
			||||||
cd /rmm/api/tacticalrmm
 | 
					cd /rmm/api/tacticalrmm
 | 
				
			||||||
pip install --no-cache-dir --upgrade pip
 | 
					pip install --no-cache-dir --upgrade pip
 | 
				
			||||||
 
 | 
				
			|||||||
							
								
								
									
										10
									
								
								update.sh
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								update.sh
									
									
									
									
									
								
							@@ -1,6 +1,6 @@
 | 
				
			|||||||
#!/usr/bin/env bash
 | 
					#!/usr/bin/env bash
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SCRIPT_VERSION="141"
 | 
					SCRIPT_VERSION="142"
 | 
				
			||||||
SCRIPT_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/update.sh'
 | 
					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'
 | 
					LATEST_SETTINGS_URL='https://raw.githubusercontent.com/amidaware/tacticalrmm/master/api/tacticalrmm/tacticalrmm/settings.py'
 | 
				
			||||||
YELLOW='\033[1;33m'
 | 
					YELLOW='\033[1;33m'
 | 
				
			||||||
@@ -10,7 +10,7 @@ NC='\033[0m'
 | 
				
			|||||||
THIS_SCRIPT=$(readlink -f "$0")
 | 
					THIS_SCRIPT=$(readlink -f "$0")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
SCRIPTS_DIR='/opt/trmm-community-scripts'
 | 
					SCRIPTS_DIR='/opt/trmm-community-scripts'
 | 
				
			||||||
PYTHON_VER='3.10.8'
 | 
					PYTHON_VER='3.11.2'
 | 
				
			||||||
SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py'
 | 
					SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
TMP_FILE=$(mktemp -p "" "rmmupdate_XXXXXXXXXX")
 | 
					TMP_FILE=$(mktemp -p "" "rmmupdate_XXXXXXXXXX")
 | 
				
			||||||
@@ -209,8 +209,8 @@ if ! sudo nginx -t > /dev/null 2>&1; then
 | 
				
			|||||||
  exit 1
 | 
					  exit 1
 | 
				
			||||||
fi
 | 
					fi
 | 
				
			||||||
 | 
					
 | 
				
			||||||
HAS_PY310=$(python3.10 --version | grep ${PYTHON_VER})
 | 
					HAS_PY311=$(python3.11 --version | grep ${PYTHON_VER})
 | 
				
			||||||
if ! [[ $HAS_PY310 ]]; then
 | 
					if ! [[ $HAS_PY311 ]]; then
 | 
				
			||||||
  printf >&2 "${GREEN}Updating to ${PYTHON_VER}${NC}\n"
 | 
					  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
 | 
					  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)
 | 
					  numprocs=$(nproc)
 | 
				
			||||||
@@ -330,7 +330,7 @@ sudo chmod +x /usr/local/bin/nats-api
 | 
				
			|||||||
if [[ "${CURRENT_PIP_VER}" != "${LATEST_PIP_VER}" ]] || [[ "$force" = true ]]; then
 | 
					if [[ "${CURRENT_PIP_VER}" != "${LATEST_PIP_VER}" ]] || [[ "$force" = true ]]; then
 | 
				
			||||||
  rm -rf /rmm/api/env
 | 
					  rm -rf /rmm/api/env
 | 
				
			||||||
  cd /rmm/api
 | 
					  cd /rmm/api
 | 
				
			||||||
  python3.10 -m venv env
 | 
					  python3.11 -m venv env
 | 
				
			||||||
  source /rmm/api/env/bin/activate
 | 
					  source /rmm/api/env/bin/activate
 | 
				
			||||||
  cd /rmm/api/tacticalrmm
 | 
					  cd /rmm/api/tacticalrmm
 | 
				
			||||||
  pip install --no-cache-dir --upgrade pip
 | 
					  pip install --no-cache-dir --upgrade pip
 | 
				
			||||||
 
 | 
				
			|||||||
		Reference in New Issue
	
	Block a user