From 35a8d6a8c7f20f8c28ecde16e87251b0fa897e72 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 13:43:36 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20?= =?UTF-8?q?=D0=BE=D1=82=20=D0=BD=D0=B5=D0=B8=D1=81=D0=BF=D0=BE=D0=BB=D1=8C?= =?UTF-8?q?=D0=B7=D1=83=D0=B5=D0=BC=D1=8B=D1=85=20=D0=BE=D0=B1=D1=80=D0=B0?= =?UTF-8?q?=D0=B7=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile_CD | 13 ++++++++++--- Jenkinsfile_CI | 5 +++++ 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 07e1a36..1634fd5 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -17,6 +17,11 @@ pipeline { } stages { + stage('Init container') { + steps { + sh 'apt-get update && apt-get install -y sshpass openssh-client' + } + } stage('Build') { steps { sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' @@ -25,9 +30,6 @@ pipeline { stage('Deploy') { steps { script { - - sh 'apt-get update && apt-get install -y sshpass openssh-client' - sh """ sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'mkdir -p ${PATH_TO_DEV_FOLDER}' sshpass -p ${SSH_PASS} scp -o StrictHostKeyChecking=no -P ${SSH_PORT} target/*.jar ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ @@ -39,6 +41,11 @@ pipeline { } } } + stage('Prune images') { + steps { + sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'docker image prune -f' + } + } } } diff --git a/Jenkinsfile_CI b/Jenkinsfile_CI index 5cf3091..29b9fcc 100644 --- a/Jenkinsfile_CI +++ b/Jenkinsfile_CI @@ -12,4 +12,9 @@ pipeline { } } } + stage('Prune images') { + steps { + sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'docker image prune -f' + } + } } \ No newline at end of file