From 925695fd567977bb7380e8c6e5a60ce2a9c50326 Mon Sep 17 00:00:00 2001 From: wh1te909 Date: Fri, 7 Apr 2023 20:30:24 +0000 Subject: [PATCH] python 3.11.3 --- .devcontainer/api.dockerfile | 4 ++-- .github/workflows/ci-tests.yml | 2 +- ansible/roles/trmm_dev/defaults/main.yml | 2 +- docker/containers/tactical/dockerfile | 6 +++--- install.sh | 4 ++-- restore.sh | 4 ++-- update.sh | 4 ++-- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/.devcontainer/api.dockerfile b/.devcontainer/api.dockerfile index 7241c1fb..ea58c902 100644 --- a/.devcontainer/api.dockerfile +++ b/.devcontainer/api.dockerfile @@ -1,11 +1,11 @@ # pulls community scripts from git repo -FROM python:3.11.2-slim AS GET_SCRIPTS_STAGE +FROM python:3.11.3-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.11.2-slim +FROM python:3.11.3-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 53542765..57b386a9 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.11.2"] + python-version: ["3.11.3"] steps: - uses: actions/checkout@v3 diff --git a/ansible/roles/trmm_dev/defaults/main.yml b/ansible/roles/trmm_dev/defaults/main.yml index d41a5b2d..02e15a80 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.11.2" +python_ver: "3.11.3" go_ver: "1.20.3" backend_repo: "https://github.com/amidaware/tacticalrmm.git" frontend_repo: "https://github.com/amidaware/tacticalrmm-web.git" diff --git a/docker/containers/tactical/dockerfile b/docker/containers/tactical/dockerfile index fd89cc01..0ad51725 100644 --- a/docker/containers/tactical/dockerfile +++ b/docker/containers/tactical/dockerfile @@ -1,5 +1,5 @@ # creates python virtual env -FROM python:3.11.2-slim AS CREATE_VENV_STAGE +FROM python:3.11.3-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.11.2-slim AS GET_SCRIPTS_STAGE +FROM python:3.11.3-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.11.2-slim +FROM python:3.11.3-slim # set env variables ENV VIRTUAL_ENV /opt/venv diff --git a/install.sh b/install.sh index 1fbd9c80..3559839c 100644 --- a/install.sh +++ b/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_VERSION="72" +SCRIPT_VERSION="73" 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.11.2' +PYTHON_VER='3.11.3' SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py' TMP_FILE=$(mktemp -p "" "rmminstall_XXXXXXXXXX") diff --git a/restore.sh b/restore.sh index 06d8bc13..45f63733 100755 --- a/restore.sh +++ b/restore.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_VERSION="47" +SCRIPT_VERSION="48" 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.11.2' +PYTHON_VER='3.11.3' SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py' TMP_FILE=$(mktemp -p "" "rmmrestore_XXXXXXXXXX") diff --git a/update.sh b/update.sh index 68bd2bc9..ffe027ae 100644 --- a/update.sh +++ b/update.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_VERSION="142" +SCRIPT_VERSION="143" 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.11.2' +PYTHON_VER='3.11.3' SETTINGS_FILE='/rmm/api/tacticalrmm/tacticalrmm/settings.py' TMP_FILE=$(mktemp -p "" "rmmupdate_XXXXXXXXXX")