From 97f97450f4dd4957e2ce7a28e2ee43c10684fe81 Mon Sep 17 00:00:00 2001
From: Vincent Guillet <vincent.guillet2@orange.fr>
Date: Fri, 28 Nov 2025 13:19:07 +0000
Subject: [PATCH] Update jenkinsfile

---
 jenkinsfile | 44 +++++++++++++++++++++++---------------------
 1 file changed, 23 insertions(+), 21 deletions(-)

diff --git a/jenkinsfile b/jenkinsfile
index 71777d2..fac9add 100644
--- a/jenkinsfile
+++ b/jenkinsfile
@@ -1,24 +1,24 @@
 pipeline {
     agent any
-    
+
     tools {
         maven 'mvn'
         nodejs 'npm'
     }
-    
+
     environment {
-        JAVA_HOME = '/opt/java/openjdk'
-        PATH = "${JAVA_HOME}/bin:${env.PATH}"
+        JAVA_HOME         = '/opt/java/openjdk'
+        PATH              = "${JAVA_HOME}/bin:${env.PATH}"
         SPRING_IMAGE_NAME = 'spring-jenkins'
         ANGULAR_IMAGE_NAME = 'angular-jenkins'
-        IMAGE_TAG = 'latest'
-        COMPOSE_PROJECT = 'gameovergne-app'
+        IMAGE_TAG         = 'latest'
+        COMPOSE_PROJECT   = 'gameovergne-app'
     }
-    
+
     stages {
         stage('Checkout sur la branche dev') {
             steps {
-                git branch: 'dev', url: 'https://gitea.vincent-guillet.fr/vincentguillet/gameovergne-app.git' 
+                git branch: 'dev', url: 'https://gitea.vincent-guillet.fr/vincentguillet/gameovergne-app.git'
             }
         }
 
@@ -51,19 +51,21 @@ pipeline {
             }
         }
 
-stage('Deployment') {
-  steps {
-    withEnv(["DOCKER_HOST=unix:///var/run/docker.sock"]) {
-      sh '''
-        cd gameovergne-app2   # si ton repo est dans ce dossier
+        stage('Deployment') {
+            steps {
+                withEnv([
+                    "DOCKER_HOST=unix:///var/run/docker.sock",
+                    "COMPOSE_PROJECT_NAME=${env.COMPOSE_PROJECT}"
+                ]) {
+                    sh '''
+                        echo "=== Nettoyage de l'ancienne stack ==="
+                        docker-compose down -v || true
 
-        echo "=== Nettoyage de l'ancienne stack ==="
-        docker-compose down -v || true
-
-        echo "=== (Re)création de la stack MySQL + Spring + Angular ==="
-        docker-compose up -d mysql spring angular
-      '''
+                        echo "=== (Re)création de la stack MySQL + Spring + Angular ==="
+                        docker-compose up -d mysql spring angular
+                    '''
+                }
+            }
+        }
     }
-  }
-}
 }
\ No newline at end of file