From 1a1fca9325f9db6c4e9d0de75aed787b49f17cee Mon Sep 17 00:00:00 2001
From: L_DelOff <l_deloff@ldeloff.ru>
Date: Tue, 21 Nov 2023 23:21:34 +0300
Subject: [PATCH] fix

---
 Jenkinsfile_CD | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD
index 3494176..c9c5350 100644
--- a/Jenkinsfile_CD
+++ b/Jenkinsfile_CD
@@ -33,6 +33,13 @@ pipeline {
                 sh 'mvn -B -DskipTests -X clean package spring-boot:repackage'
             }
         }
+        stage('Prune images pre') {
+            steps {
+                sh """
+                    sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'docker image prune --all --force'
+                """
+            }
+        }
         stage('Deploy') {
             steps {
                 script {
@@ -42,17 +49,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 builder prune --force'
                         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('Prune images post') {
             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'
                 """
             }
         }