From 806feed3663a1579d9a7d7a85c3811db79fc2991 Mon Sep 17 00:00:00 2001
From: Ioannis Foukarakis <ioannis.foukarakis@mattermost.com>
Date: Mon, 15 Jan 2024 18:02:21 +0200
Subject: [PATCH] MM-56529: update python version (#1426)

* MM-56529: update python version

* MM-56529: update python version

* MM-56529: update permifrost version

* MM-56529: remove future versions of python
---
 .github/workflows/ci-python.yml | 1 -
 Makefile                        | 2 +-
 build/Dockerfile                | 8 ++++----
 build/permifrost.Dockerfile     | 4 ++--
 4 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci-python.yml b/.github/workflows/ci-python.yml
index 41cdf1a6c..d18b12e36 100644
--- a/.github/workflows/ci-python.yml
+++ b/.github/workflows/ci-python.yml
@@ -33,7 +33,6 @@ jobs:
       matrix:
         include:
           - { name: '3.10', python: '3.10' }
-          - { name: '3.7', python: '3.7' }
     steps:
       - name: checkout
         uses: actions/checkout@v3
diff --git a/Makefile b/Makefile
index dace5dda5..d96716e92 100644
--- a/Makefile
+++ b/Makefile
@@ -45,7 +45,7 @@ DOCKER_REGISTRY_PERMIFROST_REPO    ?= mattermost/${PERMIFROST_NAME}
 DOCKER_USER             ?= user
 DOCKER_PASSWORD         ?= password
 ## Docker Images
-DOCKER_IMAGE_PYTHON     += "python:3.8.15-slim@sha256:fc2f284772a4443ce7238930ba9a8d5e3c720926616fca074b99213484a3820f"
+DOCKER_IMAGE_PYTHON     += "python:3.10.13-slim@sha256:8f2783ef8daefbcaea50242479638d1c950ec43db2a345f066f635ef2ad1626f"
 DOCKER_IMAGE_DOCKERLINT += "hadolint/hadolint:v2.9.2@sha256:d355bd7df747a0f124f3b5e7b21e9dafd0cb19732a276f901f0fdee243ec1f3b"
 DOCKER_IMAGE_COSIGN     += "bitnami/cosign:1.8.0@sha256:8c2c61c546258fffff18b47bb82a65af6142007306b737129a7bd5429d53629a"
 
diff --git a/build/Dockerfile b/build/Dockerfile
index 441050c06..5b12a00af 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_IMAGE=python:3.8.15-slim@sha256:fc2f284772a4443ce7238930ba9a8d5e3c720926616fca074b99213484a3820f
+ARG PYTHON_IMAGE=python:3.10.13-slim@sha256:8f2783ef8daefbcaea50242479638d1c950ec43db2a345f066f635ef2ad1626f
 
 ## ---------------------------base stage ----------------------------- ##
 
@@ -22,13 +22,13 @@ ENV PYTHONUNBUFFERED 1
 FROM base as builder
 
 # Poetry version
-ARG POETRY_VERSION=1.2.2
+ARG POETRY_VERSION=1.7.1
 
 # Install packages needed to build pandas/numpy etc
 RUN apt-get update && apt-get install -y --no-install-recommends \
      make=4.3-4.1 \
-     g++=4:10.2.1-1 \
-     git=1:2.30.2-1+deb11u2 && \
+     g++=4:12.2.0-3 \
+     git=1:2.39.2-1.1 && \
      rm -rf /var/lib/apt/lists/*
 
 # Sane python defaults
diff --git a/build/permifrost.Dockerfile b/build/permifrost.Dockerfile
index 32d57e6ae..c73cbd689 100644
--- a/build/permifrost.Dockerfile
+++ b/build/permifrost.Dockerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_IMAGE=python:3.8.15-slim@sha256:fc2f284772a4443ce7238930ba9a8d5e3c720926616fca074b99213484a3820f
+ARG PYTHON_IMAGE=python:3.10.13-slim@sha256:8f2783ef8daefbcaea50242479638d1c950ec43db2a345f066f635ef2ad1626f
 
 ## ---------------------------base stage ----------------------------- ##
 
@@ -33,7 +33,7 @@ RUN python3 -m venv $VIRTUAL_ENV
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
 # Install dependencies excluding dev and current package
-RUN pip install "permifrost==0.1.0"
+RUN pip install "permifrost==0.15.4"
 
 ## ---------------------------final stage ----------------------------- ##