From 0060d71636383f6941ea6274eb7a855ebf85bebb Mon Sep 17 00:00:00 2001 From: Soumaya-JE <140071440+Soumaya-JE@users.noreply.github.com> Date: Tue, 8 Oct 2024 20:10:43 +0200 Subject: [PATCH] =?UTF-8?q?Mise=20=C3=A0=20jour=20du=2008/10/2024?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/app/db_service/Dockerfile | 8 ++++---- src/app/db_service/last_inserted_line.txt | 0 src/app/db_service/main.py | 7 ++++--- 3 files changed, 8 insertions(+), 7 deletions(-) create mode 100644 src/app/db_service/last_inserted_line.txt diff --git a/src/app/db_service/Dockerfile b/src/app/db_service/Dockerfile index 73ac9ada..9782e13b 100644 --- a/src/app/db_service/Dockerfile +++ b/src/app/db_service/Dockerfile @@ -7,7 +7,7 @@ WORKDIR /app # Copier les fichiers de l'application dans le conteneur COPY main.py /app/ COPY data_fictive_drifted.csv /app/ -COPY run_insertion.sh /app/ +#COPY run_insertion.sh /app/ COPY requirements.txt /app/ COPY last_inserted_line.txt /app/ @@ -27,11 +27,11 @@ RUN pip install --no-cache-dir -r requirements.txt # Installer pandas explicitement RUN pip install pandas -# Donner les droits d'exécution au script bash -RUN chmod +x /app/run_insertion.sh +# Donner les droits d'exécution au script Python +RUN chmod +x /app/main.py # Créer un nouveau cron job qui exécute le script toutes les minutes -RUN echo "* * * * * root /app/run_insertion.sh >> /var/log/cron.log 2>&1" > /etc/cron.d/insertion-cron +RUN echo "* * * * * root /usr/local/bin/python /app/main.py >> /var/log/cron.log 2>&1" > /etc/cron.d/insertion-cron # Appliquer les permissions correctes au fichier cron job RUN chmod 0644 /etc/cron.d/insertion-cron diff --git a/src/app/db_service/last_inserted_line.txt b/src/app/db_service/last_inserted_line.txt new file mode 100644 index 00000000..e69de29b diff --git a/src/app/db_service/main.py b/src/app/db_service/main.py index bcdba827..88d5d598 100644 --- a/src/app/db_service/main.py +++ b/src/app/db_service/main.py @@ -1,3 +1,4 @@ +#!/usr/bin/env python3 import pandas as pd import psycopg2 from datetime import datetime @@ -5,10 +6,10 @@ import numpy as np # Chemin du fichier CSV -csv_file_path = 'data_fictive_drifted.csv' +csv_file_path = '/app/data_fictive_drifted.csv' # Chemin du fichier de suivi de la dernière ligne insérée -last_inserted_file = 'last_inserted_line.txt' +last_inserted_file = '/app/last_inserted_line.txt' # Charger le fichier CSV df = pd.read_csv(csv_file_path) @@ -55,7 +56,7 @@ # Connexion à la base de données PostgreSQL try: conn = psycopg2.connect( - host="localhost", + host="db", port="5432", dbname="accidents", user="my_user",