diff --git a/.devcontainer/api.dockerfile b/.devcontainer/api.dockerfile index 86bf6d91..8a753fd7 100644 --- a/.devcontainer/api.dockerfile +++ b/.devcontainer/api.dockerfile @@ -1,11 +1,11 @@ # pulls community scripts from git repo -FROM python:3.10.6-slim AS GET_SCRIPTS_STAGE +FROM python:3.10.8-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.6-slim +FROM python:3.10.8-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 5161f03d..d1e6156d 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.6"] + python-version: ["3.10.8"] steps: - uses: actions/checkout@v3 diff --git a/ansible/roles/trmm_dev/defaults/main.yml b/ansible/roles/trmm_dev/defaults/main.yml index fad820a6..1bd2aec5 100644 --- a/ansible/roles/trmm_dev/defaults/main.yml +++ b/ansible/roles/trmm_dev/defaults/main.yml @@ -1,6 +1,6 @@ --- user: "tactical" -python_ver: "3.10.6" +python_ver: "3.10.8" go_ver: "1.18.5" backend_repo: "https://github.com/amidaware/tacticalrmm.git" frontend_repo: "https://github.com/amidaware/tacticalrmm-web.git" diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index fe7e4508..0c5efecc 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -37,7 +37,7 @@ MESH_VER = "1.0.85" NATS_SERVER_VER = "2.9.3" # for the update script, bump when need to recreate venv -PIP_VER = "32" +PIP_VER = "33" SETUPTOOLS_VER = "65.5.0" WHEEL_VER = "0.37.1" diff --git a/docker/containers/tactical/dockerfile b/docker/containers/tactical/dockerfile index 29513e8b..fe177eae 100644 --- a/docker/containers/tactical/dockerfile +++ b/docker/containers/tactical/dockerfile @@ -1,5 +1,5 @@ # creates python virtual env -FROM python:3.10.6-slim AS CREATE_VENV_STAGE +FROM python:3.10.8-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.6-slim AS GET_SCRIPTS_STAGE +FROM python:3.10.8-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.6-slim +FROM python:3.10.8-slim # set env variables ENV VIRTUAL_ENV /opt/venv diff --git a/install.sh b/install.sh index 7f9f6b2e..a6aa933e 100644 --- a/install.sh +++ b/install.sh @@ -12,7 +12,7 @@ RED='\033[0;31m' NC='\033[0m' SCRIPTS_DIR='/opt/trmm-community-scripts' -PYTHON_VER='3.10.6' +PYTHON_VER='3.10.8' SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py' TMP_FILE=$(mktemp -p "" "rmminstall_XXXXXXXXXX") diff --git a/restore.sh b/restore.sh index c7305bfd..cdedacac 100755 --- a/restore.sh +++ b/restore.sh @@ -13,7 +13,7 @@ RED='\033[0;31m' NC='\033[0m' SCRIPTS_DIR='/opt/trmm-community-scripts' -PYTHON_VER='3.10.6' +PYTHON_VER='3.10.8' SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py' TMP_FILE=$(mktemp -p "" "rmmrestore_XXXXXXXXXX") diff --git a/update.sh b/update.sh index de7d05ac..6c1ca297 100644 --- a/update.sh +++ b/update.sh @@ -10,7 +10,7 @@ NC='\033[0m' THIS_SCRIPT=$(readlink -f "$0") SCRIPTS_DIR='/opt/trmm-community-scripts' -PYTHON_VER='3.10.6' +PYTHON_VER='3.10.8' SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py' TMP_FILE=$(mktemp -p "" "rmmupdate_XXXXXXXXXX")