Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions docker-compose.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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:
Expand All @@ -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
Expand Down
6 changes: 3 additions & 3 deletions engine/Dockerfile
Original file line number Diff line number Diff line change
@@ -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

Expand All @@ -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++

Expand All @@ -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
Expand Down
12 changes: 6 additions & 6 deletions engine/requirements.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion engine/utils/utils.py
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down