From aaecae811ecc13a6f75a0a1d602c0d3077b85ef6 Mon Sep 17 00:00:00 2001 From: AbidiWael Date: Wed, 19 Feb 2025 11:17:28 +0100 Subject: [PATCH 1/3] fix: update dependencies versions in requirements.txt to resolve conflicts --- backend/requirements.txt | Bin 726 -> 378 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/backend/requirements.txt b/backend/requirements.txt index b82af78ac7f385e8581531589d318c485497f9f2..e425e0519941a8bb7a47e956ab57f8133c1f9a8a 100644 GIT binary patch delta 11 Scmcb{`ip5p9OL9&Ofmo+>;zH( delta 57 zcmeyxbd7aG9OFbLGe+ZymbQ!r6U%iOO(!nZWi@2bV=$U{U6#>k;#XBh Date: Wed, 19 Feb 2025 11:18:15 +0100 Subject: [PATCH 2/3] feat: add Dockerfile and docker-compose.yml for containerized deployment --- backend/Dockerfile | 20 ++++++++++++++++++++ docker-compose.yml | 19 +++++++++++++++++++ 2 files changed, 39 insertions(+) create mode 100644 backend/Dockerfile create mode 100644 docker-compose.yml diff --git a/backend/Dockerfile b/backend/Dockerfile new file mode 100644 index 0000000..1a91fe2 --- /dev/null +++ b/backend/Dockerfile @@ -0,0 +1,20 @@ +# Utiliser une image officielle Python comme base +FROM python:3.11 + +# Définir le répertoire de travail dans le conteneur +WORKDIR /app + +# Copier les fichiers nécessaires +COPY requirements.txt . + +# Installer les dépendances +RUN pip install --no-cache-dir -r requirements.txt + +# Copier le reste du code +COPY . . + +# Exposer le port sur lequel Flask écoute +EXPOSE 5000 + +# Commande pour lancer l'application +CMD ["python", "app.py"] diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..e4f95eb --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,19 @@ +version: "3.8" + +services: + redis: + image: "redis:alpine" + container_name: redis-server + ports: + - "6379:6379" + + backend: + build: ./backend + container_name: flask-backend + ports: + - "5000:5000" + depends_on: + - redis + environment: + - REDIS_HOST=redis + - REDIS_PORT=6379 -- GitLab From db239fd1105b7b76c5f9d98393a490378702e1d3 Mon Sep 17 00:00:00 2001 From: AbidiWael Date: Wed, 19 Feb 2025 11:18:37 +0100 Subject: [PATCH 3/3] refactor: update app.py to support Redis connection in Docker environment --- backend/app.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/app.py b/backend/app.py index 042eeeb..c9712c3 100644 --- a/backend/app.py +++ b/backend/app.py @@ -1,12 +1,15 @@ -from flask import Flask, request, jsonify +import os +import redis import hashlib import itertools -import redis +from flask import Flask, request, jsonify app = Flask(__name__) # Configuration de Redis -redis_client = redis.StrictRedis(host='localhost', port=6379, db=0, decode_responses=True) +redis_host = os.getenv("REDIS_HOST", "redis") # "redis" correspond au nom du service Redis dans docker-compose +redis_port = int(os.getenv("REDIS_PORT", 6379)) +redis_client = redis.StrictRedis(host=redis_host, port=redis_port, db=0, decode_responses=True) @app.route("/bruteforce", methods=["POST"]) -- GitLab