тест коммита

Dockerfile

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

Jenkinsfile_CD

@@ -1,57 +0,0 @@
-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 \$application_yaml src/main/resources/application.yml"
-                }
-                sh 'mvn -B -DskipTests -X clean package spring-boot:repackage'
-            }
-        }
-        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 -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') {
-            steps {
-                sh """
-                    sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'docker image prune -f'
-                """
-            }
-        }
-    }
-}
-

Jenkinsfile_CI

@@ -1,29 +0,0 @@
-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')
-    }
-    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'
-                """
-            }
-        }
-    }
-
-}

docker-compose.yml

@@ -1,21 +0,0 @@
-version: '3'
-services:
-  app:
-    build:
-      context: .
-    depends_on:
-      - db
-    networks:
-      default:
-
-  db:
-    image: postgres:latest
-    environment:
-      POSTGRES_USER: servermonitorbot
-      POSTGRES_PASSWORD: servermonitorbot
-      POSTGRES_DB: servermonitorbot
-    networks:
-      default:
-
-networks:
-  default:

pom.xml

@@ -15,11 +15,6 @@
     <description>ServerMonitorBot</description>
     <properties>
         <java.version>17</java.version>
-        <flyway.version>9.16.0</flyway.version>
-        <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>
@@ -45,7 +40,7 @@
         <dependency>
             <groupId>org.telegram</groupId>
             <artifactId>telegrambots</artifactId>
-            <version>6.8.0</version>
+            <version>6.7.0</version>
         </dependency>
         <dependency>
             <groupId>com.jcraft</groupId>
@@ -57,13 +52,12 @@
             <artifactId>spring-boot-starter-data-jpa</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.postgresql</groupId>
+            <groupId>org.liquibase</groupId>
-            <artifactId>postgresql</artifactId>
+            <artifactId>liquibase-core</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.flywaydb</groupId>
+            <groupId>org.postgresql</groupId>
-            <artifactId>flyway-core</artifactId>
+            <artifactId>postgresql</artifactId>
-            <version>${flyway.version}</version>
         </dependency>
     </dependencies>
 
@@ -81,39 +75,6 @@
                     </excludes>
                 </configuration>
             </plugin>
-            <plugin>
-                <groupId>org.flywaydb</groupId>
-                <artifactId>flyway-maven-plugin</artifactId>
-                <version>${flyway.version}</version>
-                <executions>
-                    <execution>
-                        <id>migrate</id>
-                        <phase>deploy</phase>
-                        <goals>
-                            <goal>migrate</goal>
-                        </goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <url>${database.url}</url>
-                    <user>${database.username}</user>
-                    <password>${database.password}</password>
-                    <locations>
-                        <location>classpath:db/migration</location>
-                    </locations>
-                </configuration>
-            </plugin>
-            <plugin>
-                <groupId>org.springframework.boot</groupId>
-                <artifactId>spring-boot-maven-plugin</artifactId>
-                <executions>
-                    <execution>
-                        <goals>
-                            <goal>repackage</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
         </plugins>
     </build>
 

src/main/resources/application.yml

@@ -2,14 +2,20 @@ spring:
   application:
     name: ServerMonitorBot
   datasource:
-    url: jdbc:postgresql://test:5432/servermonitorbot
+    url: jdbc:postgresql://localhost:5432/servermonitorbot
-    username: test
+    username: servermonitorbot
-    password: test
+    password: servermonitorbot
   jpa:
     hibernate:
       ddl-auto: none
-  flyway:
+  liquibase:
-    locations: classpath:db/migration
+    enabled: true
+    change-log: classpath:db/scripts/changelog-master.xml
+    url: jdbc:postgresql://localhost:5432/servermonitorbot
+    user: servermonitorbot
+    password: servermonitorbot
+    liquibase-schema: "liquibase"
+    default-schema: "servermonitorbot"
 bot:
   name: "ServerMonitorBot"
   token: "token"

src/main/resources/db/scripts/changelog-master.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <include file="release_0_0_1/changelog.xml" relativeToChangelogFile="true"/>
+
+
+</databaseChangeLog>

src/main/resources/db/scripts/release_0_0_1/changelog.xml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.1.xsd">
+
+    <include file="scripts/01_create_table_users.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/02_create_table_roles.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/03_add_FK_users_to_roles.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/04_add_roles.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/05_add_anonymous_role.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/06_refactor_users_table.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/07_refactor_roles_table.sql" relativeToChangelogFile="true"/>
+    <include file="scripts/08_add_roles.sql" relativeToChangelogFile="true"/>
+
+</databaseChangeLog>

src/main/resources/db/scripts/release_0_0_1/scripts/01_create_table_users.sql

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

src/main/resources/db/scripts/release_0_0_1/scripts/02_create_table_roles.sql

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