From 90d3804dbdb922702a9b8db0554b54bfc4ad69b7 Mon Sep 17 00:00:00 2001
From: kPsarakis <kpsarakis94@gmail.com>
Date: Tue, 3 Jun 2025 21:13:32 +0200
Subject: [PATCH] pin working versions and upgrade Flask

---
 docker-compose.yaml     |  6 +++---
 engine/Dockerfile       |  6 +++---
 engine/requirements.txt | 12 ++++++------
 engine/utils/utils.py   |  2 +-
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docker-compose.yaml b/docker-compose.yaml
index 564f62e..d87c45b 100644
--- a/docker-compose.yaml
+++ b/docker-compose.yaml
@@ -31,7 +31,7 @@ services:
 
   # S3-like object store holding the data that we want to match
   minio:
-    image: minio/minio:latest
+    image: minio/minio:RELEASE.2021-08-17T20-53-08Z
     ports:
       - "9000:9000"
     volumes:
@@ -62,7 +62,7 @@ services:
 
   # Message queue required by Celery
   celery-rabbitmq:
-    image: rabbitmq:management
+    image: rabbitmq:3.11.28-management
     restart: always
     env_file: env_files/rabbitmq.env
     ports:
@@ -88,7 +88,7 @@ services:
       - celery-worker
 
   postgres-db:
-    image: postgres:latest
+    image: postgres:9.6
     env_file: env_files/postgres.env
     command: "postgres -c max_connections=100 -c shared_buffers=128MB"
     shm_size: 128M
diff --git a/engine/Dockerfile b/engine/Dockerfile
index d75d6fc..d7cc3ab 100644
--- a/engine/Dockerfile
+++ b/engine/Dockerfile
@@ -1,5 +1,5 @@
 # Build  COMA and its dependancies from source
-FROM openjdk:8-slim-bullseye as build-stage-COMA
+FROM openjdk:8-slim-bullseye AS build-stage-COMA
 
 RUN apt-get update && apt-get -y --no-install-recommends install git patch dos2unix maven
 
@@ -15,7 +15,7 @@ RUN git clone https://github.com/kPsarakis/COMA \
     && mv COMA/coma-engine/target/coma-engine-0.1-CE-SNAPSHOT-jar-with-dependencies.jar /usr/local/coma.jar
 
 # Python dependancies builder
-FROM python:3.9-slim-bullseye as builder
+FROM python:3.9-slim-bullseye AS builder
 
 RUN apt-get update && apt-get install -y --no-install-recommends gcc g++
 
@@ -26,7 +26,7 @@ RUN pip3 install --upgrade pip \
     && python -m nltk.downloader -d /usr/local/share/nltk_data stopwords punkt wordnet
 
 # Clean Python 3.9 env
-FROM python:3.9-slim-bullseye as clean-Python
+FROM python:3.9-slim-bullseye AS clean-Python
 
 # Create the final service
 FROM openjdk:8-slim-bullseye
diff --git a/engine/requirements.txt b/engine/requirements.txt
index 4cb464b..d63d363 100644
--- a/engine/requirements.txt
+++ b/engine/requirements.txt
@@ -22,12 +22,12 @@ openpyxl==3.0.10
 python-dateutil==2.8.2
 more-itertools==8.14.0
 # Flask API
-Flask==2.2.2
-Flask-WTF==1.0.1
-Flask-Cors==3.0.10
-pydantic==1.10.2
-requests==2.28.1
-gunicorn==20.1.0
+Flask==3.1.1
+Flask-WTF==1.2.2
+Flask-Cors==6.0.0
+pydantic==2.11.5
+requests==2.32.3
+gunicorn==23.0.0
 # redis connector
 redis==4.3.4
 # minio connector
diff --git a/engine/utils/utils.py b/engine/utils/utils.py
index 7239ac1..d22af47 100644
--- a/engine/utils/utils.py
+++ b/engine/utils/utils.py
@@ -7,7 +7,7 @@
 import openpyxl
 from dateutil.parser import parse
 import chardet
-from flask.json import JSONEncoder
+from json import JSONEncoder
 import numpy as np
 from minio import Minio