From c35cfc50d482e1882d4c79352b4343c17d1d5caf Mon Sep 17 00:00:00 2001
From: Soriba SYLLA <soribasyllakamsar@gmail.com>
Date: Wed, 6 May 2026 11:19:30 +0000
Subject: [PATCH] Prise en charge de la photo de profil

---
 .gitignore  | 7 ++++++-
 Jenkinsfile | 7 ++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 4246bfc..6778537 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 <<<<<<< HEAD
+<<<<<<< HEAD
 __pycache__/
 *.pyc
 =======
@@ -17,7 +18,11 @@ __pycache__/
 __pycache__/
 *.pyc
 
+=======
+>>>>>>> 34a261a (Prise en charge de la photo de profil)
 db.sqlite3
 venv/
+media/
+staticfiles/
 .env
->>>>>>> c28b14f (clean: remove pycache from tracking)
+migrations/
\ No newline at end of file
diff --git a/Jenkinsfile b/Jenkinsfile
index cfcfb0f..d4d58f6 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -29,12 +29,17 @@ pipeline
                 sh '''
                 cd /var/www/sirh
                 echo $SUDO_PASSWORD | sudo -S chown -R jenkins:jenkins /var/www/sirh
-                git pull origin main
+
+                git fetch origin main
+                git reset --hard origin/main
+
                 python3 -m venv venv 
                 . venv/bin/activate
                 pip install -r requirements.txt
+
                 python manage.py makemigrations
                 python manage.py migrate
+                
                 echo $SUDO_PASSWORD | sudo -S chown -R www-data:www-data /var/www/sirh
                 echo "Deploiement reussi"
                 echo $SUDO_PASSWORD | sudo -S supervisorctl restart sirh