From aa0f6ecd750ff73a845928b27ded1a8f6ed80507 Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Sun, 14 Aug 2022 08:14:59 +0000 Subject: [PATCH] python 3.10.6 --- .devcontainer/api.dockerfile | 4 ++-- .github/workflows/ci-tests.yml | 2 +- api/tacticalrmm/tacticalrmm/settings.py | 4 ++-- docker/containers/tactical/dockerfile | 6 +++--- install.sh | 4 ++-- restore.sh | 6 +++--- update.sh | 4 ++-- 7 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.devcontainer/api.dockerfile b/.devcontainer/api.dockerfile index a14238c6..86bf6d91 100644 --- a/.devcontainer/api.dockerfile +++ b/.devcontainer/api.dockerfile @@ -1,11 +1,11 @@ # pulls community scripts from git repo -FROM python:3.10-slim AS GET_SCRIPTS_STAGE +FROM python:3.10.6-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-slim +FROM python:3.10.6-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 cb06c9b1..5161f03d 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.4"] + python-version: ["3.10.6"] steps: - uses: actions/checkout@v3 diff --git a/api/tacticalrmm/tacticalrmm/settings.py b/api/tacticalrmm/tacticalrmm/settings.py index cee56a53..df6b90d6 100644 --- a/api/tacticalrmm/tacticalrmm/settings.py +++ b/api/tacticalrmm/tacticalrmm/settings.py @@ -34,9 +34,9 @@ MESH_VER = "1.0.60" NATS_SERVER_VER = "2.8.4" # for the update script, bump when need to recreate venv -PIP_VER = "31" +PIP_VER = "32" -SETUPTOOLS_VER = "62.6.0" +SETUPTOOLS_VER = "64.0.3" WHEEL_VER = "0.37.1" AGENT_BASE_URL = "https://agents.tacticalrmm.com" diff --git a/docker/containers/tactical/dockerfile b/docker/containers/tactical/dockerfile index 9dd94892..29513e8b 100644 --- a/docker/containers/tactical/dockerfile +++ b/docker/containers/tactical/dockerfile @@ -1,5 +1,5 @@ # creates python virtual env -FROM python:3.10.4-slim AS CREATE_VENV_STAGE +FROM python:3.10.6-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.4-slim AS GET_SCRIPTS_STAGE +FROM python:3.10.6-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.4-slim +FROM python:3.10.6-slim # set env variables ENV VIRTUAL_ENV /opt/venv diff --git a/install.sh b/install.sh index d1cbb7de..75df6553 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_VERSION="66" +SCRIPT_VERSION="67" 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.4' +PYTHON_VER='3.10.6' SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py' TMP_FILE=$(mktemp -p "" "rmminstall_XXXXXXXXXX") diff --git a/restore.sh b/restore.sh index 1e3ea2ad..7fca5286 100755 --- a/restore.sh +++ b/restore.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_VERSION="40" +SCRIPT_VERSION="41" 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.4' +PYTHON_VER='3.10.6' SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py' TMP_FILE=$(mktemp -p "" "rmmrestore_XXXXXXXXXX") @@ -175,7 +175,7 @@ print_green 'Restoring systemd services' sudo cp $tmp_dir/systemd/* /etc/systemd/system/ sudo systemctl daemon-reload -print_green 'Installing Python 3.10.4' +print_green "Installing Python ${PYTHON_VER}" 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) diff --git a/update.sh b/update.sh index b8c3c838..95c09bad 100644 --- a/update.sh +++ b/update.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_VERSION="138" +SCRIPT_VERSION="139" 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.4' +PYTHON_VER='3.10.6' SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py' TMP_FILE=$(mktemp -p "" "rmmupdate_XXXXXXXXXX")