Удаление старых образов перед деплоем

Jenkinsfile_CD

@@ -25,13 +25,25 @@ pipeline {
         stage('Build') {
             steps {
                 withCredentials([file(credentialsId: 'SERVERMONITORBOT_APPLICATION_YAML', variable: 'application_yaml')]) {
-                   sh "cp \$application_yaml src/main/resources/application.yml"
-                   sh "ls"
-                   sh "ls -lh src/main/resources/"
+                   sh "cp -f \$application_yaml src/main/resources/application.yml"
                 }
                 sh 'mvn -B -DskipTests -X clean package spring-boot:repackage'
             }
         }
+        stage('Stop container') {
+            steps {
+                sh """
+                    sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker compose down'
+                """
+            }
+        }
+        stage('Remove old image') {
+            steps {
+                sh """
+                    sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'docker image rm -f ${IMAGE_NAME}:${IMAGE_VERSION} || true'
+                """
+            }
+        }
         stage('Deploy') {
             steps {
                 script {
@@ -41,16 +53,16 @@ pipeline {
                         sshpass -p ${SSH_PASS} scp -o StrictHostKeyChecking=no -P ${SSH_PORT} target/*.jar ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/
                         sshpass -p ${SSH_PASS} scp -o StrictHostKeyChecking=no -P ${SSH_PORT} Dockerfile ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/
                         sshpass -p ${SSH_PASS} scp -o StrictHostKeyChecking=no -P ${SSH_PORT} docker-compose.yml ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/
-                        sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker build -t ${IMAGE_NAME}:${IMAGE_VERSION} .'
+                        sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker build --no-cache -t ${IMAGE_NAME}:${IMAGE_VERSION} .'
                         sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker compose up -d'
                     """
                 }
             }
         }
-        stage('Prune images') {
+        stage('Remove useless images') {
             steps {
                 sh """
-                    sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'docker image prune -f'
+                    sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'docker image prune --all --force'
                 """
             }
         }

Jenkinsfile_CI

@@ -5,25 +5,11 @@ pipeline {
             args '-v /root/.m2:/root/.m2'
         }
     }
-    environment {
-       SSH_HOST = credentials('ROCK_PI_5_SSH_HOST')
-       SSH_PORT = credentials('ROCK_PI_5_SSH_PORT')
-       SSH_USER = credentials('ROCK_PI_5_SSH_USER')
-       SSH_PASS = credentials('ROCK_PI_5_SSH_PASS')
-    }
     stages {
         stage('Build') {
             steps {
                 sh 'mvn -B -DskipTests -X clean package spring-boot:repackage'
             }
         }
-        stage('Prune images') {
-            steps {
-                sh """
-                    sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'docker image prune -f'
-                """
-            }
-        }
     }
-
 }

pom.xml

@@ -5,7 +5,7 @@
     <parent>
         <groupId>org.springframework.boot</groupId>
         <artifactId>spring-boot-starter-parent</artifactId>
-        <version>3.1.3</version>
+        <version>3.1.2</version>
         <relativePath/> <!-- lookup parent from repository -->
     </parent>
     <groupId>ru.ldeloff</groupId>