diff --git a/jenkinsfile b/jenkinsfile index fac9add..3412419 100644 --- a/jenkinsfile +++ b/jenkinsfile @@ -7,12 +7,12 @@ pipeline { } environment { - JAVA_HOME = '/opt/java/openjdk' - PATH = "${JAVA_HOME}/bin:${env.PATH}" - SPRING_IMAGE_NAME = 'spring-jenkins' + 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 { @@ -58,7 +58,10 @@ pipeline { "COMPOSE_PROJECT_NAME=${env.COMPOSE_PROJECT}" ]) { sh ''' - echo "=== Nettoyage de l'ancienne stack ===" + echo "=== Nettoyage des anciens conteneurs nommés ===" + docker rm -f gameovergne-mysql gameovergne-api gameovergne-client 2>/dev/null || true + + echo "=== docker-compose down sur le projet courant ===" docker-compose down -v || true echo "=== (Re)création de la stack MySQL + Spring + Angular ==="