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

Dockerfile

@@ -1,11 +1,11 @@
 # Используем официальный образ OpenJDK 17 как базовый образ
-FROM openjdk:17-jre-slim
+FROM openjdk:17
 
 # Установка рабочей директории внутри контейнера
 WORKDIR /app
 
 # Копируем JAR-файл приложения из локальной директории внутрь контейнера
-COPY target/ServerMonitorBot-0.0.1-SNAPSHOT.jar app.jar
+COPY ServerMonitorBot-0.0.1-SNAPSHOT.jar app.jar
 
 # Команда для запуска Spring Boot приложения при старте контейнера
 CMD ["java", "-jar", "app.jar"]

Jenkinsfile_CD

@@ -0,0 +1,71 @@
+pipeline {
+    agent {
+        docker {
+            image 'maven:3.9.5-eclipse-temurin-17'
+            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')
+       PATH_TO_DEV_FOLDER = credentials('SERVERMONITORBOT_PATH_TO_DEV_FOLDER')
+       IMAGE_NAME = 'servermonitorbot'
+       IMAGE_VERSION = 'latest'
+    }
+
+    stages {
+        stage('Init container') {
+            steps {
+                sh 'apt-get update && apt-get install -y sshpass openssh-client'
+            }
+        }
+        stage('Build') {
+            steps {
+                withCredentials([file(credentialsId: 'SERVERMONITORBOT_APPLICATION_YAML', variable: 'application_yaml')]) {
+                   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 {
+                    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} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'rm -f ${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}/
+                        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 --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('Remove useless images') {
+            steps {
+                sh """
+                    sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'docker image prune --all --force'
+                """
+            }
+        }
+    }
+}
+

Jenkinsfile_CI

@@ -1,14 +1,14 @@
 pipeline {
     agent {
         docker {
-            image 'maven'
+            image 'maven:3.9.5-eclipse-temurin-17'
             args '-v /root/.m2:/root/.m2'
         }
     }
     stages {
         stage('Build') {
             steps {
-                sh 'mvn -B -DskipTests clean package'
+                sh 'mvn -B -DskipTests -X clean package spring-boot:repackage'
             }
         }
     }

docker-compose.yml

@@ -5,10 +5,17 @@ services:
       context: .
     depends_on:
       - db
+    networks:
+      default:
 
   db:
     image: postgres:latest
     environment:
       POSTGRES_USER: servermonitorbot
       POSTGRES_PASSWORD: servermonitorbot
-      POSTGRES_DB: servermonitorbot
+      POSTGRES_DB: servermonitorbot
+    networks:
+      default:
+
+networks:
+  default:

pom.xml

@@ -16,9 +16,10 @@
     <properties>
         <java.version>17</java.version>
         <flyway.version>9.16.0</flyway.version>
-        <db.url>${db.url}</db.url>
-        <db.user>${db.username}</db.user>
-        <db.password>${db.password}</db.password>
+        <db.url>${database.url}</db.url>
+        <db.user>${database.username}</db.user>
+        <db.password>${database.password}</db.password>
+        <start-class>ru.ldeloff.servermonitorbot.ServerMonitorBotApplication</start-class>
     </properties>
     <dependencies>
         <dependency>
@@ -44,7 +45,7 @@
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots</artifactId>
-            <version>6.7.0</version>
+            <version>6.8.0</version>
         </dependency>
         <dependency>
             <groupId>com.jcraft</groupId>
@@ -69,12 +70,15 @@
     <build>
         <plugins>
             <plugin>
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>3.8.1</version> <!-- Укажите актуальную версию плагина -->
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
                 <configuration>
-                    <source>${java.version}</source> <!-- Укажите версию исходного кода Java -->
-                    <target>${java.version}</target> <!-- Укажите версию целевого байт-кода Java -->
+                    <excludes>
+                        <exclude>
+                            <groupId>org.projectlombok</groupId>
+                            <artifactId>lombok</artifactId>
+                        </exclude>
+                    </excludes>
                 </configuration>
             </plugin>
             <plugin>
@@ -91,45 +95,21 @@
                     </execution>
                 </executions>
                 <configuration>
-                    <url>${db.url}</url>
-                    <user>${db.username}</user>
-                    <password>${db.password}</password>
+                    <url>${database.url}</url>
+                    <user>${database.username}</user>
+                    <password>${database.password}</password>
                     <locations>
                         <location>classpath:db/migration</location>
                     </locations>
                 </configuration>
             </plugin>
             <plugin>
-                <groupId>com.spotify</groupId>
-                <artifactId>docker-maven-plugin</artifactId>
-                <version>1.2.0</version>
+                <groupId>org.springframework.boot</groupId>
+                <artifactId>spring-boot-maven-plugin</artifactId>
                 <executions>
                     <execution>
-                        <id>build-image</id>
-                        <phase>install</phase>
                         <goals>
-                            <goal>build</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <imageName>ServerMonitorBot</imageName>
-                    <serverId>remote-docker</serverId>
-                    <dockerDirectory>.</dockerDirectory>
-                    <resources>
-                        <resource>
-                            <targetPath>/</targetPath>
-                            <directory>${project.build.directory}</directory>
-                            <include>${project.build.finalName}.jar</include>
-                        </resource>
-                    </resources>
-                </configuration>
-                <executions>
-                    <execution>
-                        <id>build-image</id>
-                        <phase>package</phase>
-                        <goals>
-                            <goal>build</goal>
+                            <goal>repackage</goal>
                         </goals>
                     </execution>
                 </executions>

src/main/resources/application.yml

@@ -2,9 +2,9 @@ spring:
   application:
     name: ServerMonitorBot
   datasource:
-    url: @db.url@
-    username: @db.username@
-    password: @db.password@
+    url: jdbc:postgresql://db:5432/servermonitorbot
+    username: servermonitorbot
+    password: servermonitorbot
   jpa:
     hibernate:
       ddl-auto: none

src/main/resources/db/migration/V001__create_table_users.sql

@@ -1,8 +1,5 @@
---liquibase formatted sql
-
 --changeset L_DelOff:create_table_users rollbackSplitStatements:true
 --comment: Создание таблицы пользователей
-CREATE SCHEMA servermonitorbot;
 CREATE TABLE users
 (
     id       SERIAL        PRIMARY KEY,

src/main/resources/db/migration/V002__create_table_roles.sql

@@ -1,5 +1,3 @@
---liquibase formatted sql
-
 --changeset L_DelOff:create_table_roles rollbackSplitStatements:true
 --comment: Создание таблицы ролей
 CREATE TABLE roles