From b71b4db66e7d09dc85d35681b36ec1fd79ef4724 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Fri, 17 Nov 2023 09:29:19 +0300 Subject: [PATCH 01/75] Flyway --- Dockerfile | 11 +++ docker-compose.yml | 14 ++++ pom.xml | 83 ++++++++++++++++--- src/main/resources/application.yml | 16 ++-- .../V001__create_table_users.sql} | 1 + .../V002__create_table_roles.sql} | 0 .../V003__add_FK_users_to_roles.sql} | 0 .../V004__add_roles.sql} | 0 .../V005__add_anonymous_role.sql} | 0 .../V006__refactor_users_table.sql} | 0 .../V007__refactor_roles_table.sql} | 0 .../V008__add_roles.sql} | 0 .../resources/db/scripts/changelog-master.xml | 10 --- .../db/scripts/release_0_0_1/changelog.xml | 16 ---- .../00_create_schema_servermonitorbot.sql | 0 15 files changed, 102 insertions(+), 49 deletions(-) create mode 100644 Dockerfile create mode 100644 docker-compose.yml rename src/main/resources/db/{scripts/release_0_0_1/scripts/01_create_table_users.sql => migration/V001__create_table_users.sql} (95%) rename src/main/resources/db/{scripts/release_0_0_1/scripts/02_create_table_roles.sql => migration/V002__create_table_roles.sql} (100%) rename src/main/resources/db/{scripts/release_0_0_1/scripts/03_add_FK_users_to_roles.sql => migration/V003__add_FK_users_to_roles.sql} (100%) rename src/main/resources/db/{scripts/release_0_0_1/scripts/04_add_roles.sql => migration/V004__add_roles.sql} (100%) rename src/main/resources/db/{scripts/release_0_0_1/scripts/05_add_anonymous_role.sql => migration/V005__add_anonymous_role.sql} (100%) rename src/main/resources/db/{scripts/release_0_0_1/scripts/06_refactor_users_table.sql => migration/V006__refactor_users_table.sql} (100%) rename src/main/resources/db/{scripts/release_0_0_1/scripts/07_refactor_roles_table.sql => migration/V007__refactor_roles_table.sql} (100%) rename src/main/resources/db/{scripts/release_0_0_1/scripts/08_add_roles.sql => migration/V008__add_roles.sql} (100%) delete mode 100644 src/main/resources/db/scripts/changelog-master.xml delete mode 100644 src/main/resources/db/scripts/release_0_0_1/changelog.xml delete mode 100644 src/main/resources/db/scripts/release_0_0_1/scripts/00_create_schema_servermonitorbot.sql diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..e4f35b0 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,11 @@ +# Используем официальный образ OpenJDK 17 как базовый образ +FROM openjdk:17-jre-slim + +# Установка рабочей директории внутри контейнера +WORKDIR /app + +# Копируем JAR-файл приложения из локальной директории внутрь контейнера +COPY target/ServerMonitorBot-0.0.1-SNAPSHOT.jar app.jar + +# Команда для запуска Spring Boot приложения при старте контейнера +CMD ["java", "-jar", "app.jar"] \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 0000000..e0ec7fc --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,14 @@ +version: '3' +services: + app: + build: + context: . + depends_on: + - db + + db: + image: postgres:latest + environment: + POSTGRES_USER: servermonitorbot + POSTGRES_PASSWORD: servermonitorbot + POSTGRES_DB: servermonitorbot \ No newline at end of file diff --git a/pom.xml b/pom.xml index fbc64ec..60d4474 100644 --- a/pom.xml +++ b/pom.xml @@ -15,6 +15,10 @@ ServerMonitorBot 17 + 9.16.0 + ${db.url} + ${db.username} + ${db.password} @@ -51,30 +55,85 @@ org.springframework.boot spring-boot-starter-data-jpa - - org.liquibase - liquibase-core - org.postgresql postgresql + + org.flywaydb + flyway-core + ${flyway.version} + - org.springframework.boot - spring-boot-maven-plugin + org.apache.maven.plugins + maven-compiler-plugin + 3.8.1 - - - org.projectlombok - lombok - - + ${java.version} + ${java.version} + + org.flywaydb + flyway-maven-plugin + ${flyway.version} + + + migrate + deploy + + migrate + + + + + ${db.url} + ${db.username} + ${db.password} + + classpath:db/migration + + + + + com.spotify + docker-maven-plugin + 1.2.0 + + + build-image + install + + build + + + + + ServerMonitorBot + remote-docker + . + + + / + ${project.build.directory} + ${project.build.finalName}.jar + + + + + + build-image + package + + build + + + + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 35a985d..21fe203 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,20 +2,14 @@ spring: application: name: ServerMonitorBot datasource: - url: jdbc:postgresql://localhost:5432/servermonitorbot - username: servermonitorbot - password: servermonitorbot + url: @db.url@ + username: @db.username@ + password: @db.password@ jpa: hibernate: ddl-auto: none - liquibase: - 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" + flyway: + locations: classpath:db/migration bot: name: "ServerMonitorBot" token: "token" diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/01_create_table_users.sql b/src/main/resources/db/migration/V001__create_table_users.sql similarity index 95% rename from src/main/resources/db/scripts/release_0_0_1/scripts/01_create_table_users.sql rename to src/main/resources/db/migration/V001__create_table_users.sql index 9164f99..e53a200 100644 --- a/src/main/resources/db/scripts/release_0_0_1/scripts/01_create_table_users.sql +++ b/src/main/resources/db/migration/V001__create_table_users.sql @@ -2,6 +2,7 @@ --changeset L_DelOff:create_table_users rollbackSplitStatements:true --comment: Создание таблицы пользователей +CREATE SCHEMA servermonitorbot; CREATE TABLE users ( id SERIAL PRIMARY KEY, diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/02_create_table_roles.sql b/src/main/resources/db/migration/V002__create_table_roles.sql similarity index 100% rename from src/main/resources/db/scripts/release_0_0_1/scripts/02_create_table_roles.sql rename to src/main/resources/db/migration/V002__create_table_roles.sql diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/03_add_FK_users_to_roles.sql b/src/main/resources/db/migration/V003__add_FK_users_to_roles.sql similarity index 100% rename from src/main/resources/db/scripts/release_0_0_1/scripts/03_add_FK_users_to_roles.sql rename to src/main/resources/db/migration/V003__add_FK_users_to_roles.sql diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/04_add_roles.sql b/src/main/resources/db/migration/V004__add_roles.sql similarity index 100% rename from src/main/resources/db/scripts/release_0_0_1/scripts/04_add_roles.sql rename to src/main/resources/db/migration/V004__add_roles.sql diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/05_add_anonymous_role.sql b/src/main/resources/db/migration/V005__add_anonymous_role.sql similarity index 100% rename from src/main/resources/db/scripts/release_0_0_1/scripts/05_add_anonymous_role.sql rename to src/main/resources/db/migration/V005__add_anonymous_role.sql diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/06_refactor_users_table.sql b/src/main/resources/db/migration/V006__refactor_users_table.sql similarity index 100% rename from src/main/resources/db/scripts/release_0_0_1/scripts/06_refactor_users_table.sql rename to src/main/resources/db/migration/V006__refactor_users_table.sql diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/07_refactor_roles_table.sql b/src/main/resources/db/migration/V007__refactor_roles_table.sql similarity index 100% rename from src/main/resources/db/scripts/release_0_0_1/scripts/07_refactor_roles_table.sql rename to src/main/resources/db/migration/V007__refactor_roles_table.sql diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/08_add_roles.sql b/src/main/resources/db/migration/V008__add_roles.sql similarity index 100% rename from src/main/resources/db/scripts/release_0_0_1/scripts/08_add_roles.sql rename to src/main/resources/db/migration/V008__add_roles.sql diff --git a/src/main/resources/db/scripts/changelog-master.xml b/src/main/resources/db/scripts/changelog-master.xml deleted file mode 100644 index bd90cc4..0000000 --- a/src/main/resources/db/scripts/changelog-master.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/src/main/resources/db/scripts/release_0_0_1/changelog.xml b/src/main/resources/db/scripts/release_0_0_1/changelog.xml deleted file mode 100644 index 1b0334d..0000000 --- a/src/main/resources/db/scripts/release_0_0_1/changelog.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/src/main/resources/db/scripts/release_0_0_1/scripts/00_create_schema_servermonitorbot.sql b/src/main/resources/db/scripts/release_0_0_1/scripts/00_create_schema_servermonitorbot.sql deleted file mode 100644 index e69de29..0000000 From fd4248d722dc6e14693c4e37c11a8bba66540fa0 Mon Sep 17 00:00:00 2001 From: l_deloff Date: Sun, 19 Nov 2023 14:07:01 +0000 Subject: [PATCH 02/75] KUKUSIKI --- Jenkinsfile | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 Jenkinsfile diff --git a/Jenkinsfile b/Jenkinsfile new file mode 100644 index 0000000..4ffae25 --- /dev/null +++ b/Jenkinsfile @@ -0,0 +1,11 @@ +pipeline { + agent any + stages { + stage('') { + steps { + echo 'KUKUSIKI' + } + } + + } +} \ No newline at end of file From 638dc42a467fba44e30533317ccdf94bc096cee4 Mon Sep 17 00:00:00 2001 From: l_deloff Date: Sun, 19 Nov 2023 14:11:02 +0000 Subject: [PATCH 03/75] KAKASIKI --- Jenkinsfile | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 4ffae25..b67d63e 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,11 +1,17 @@ pipeline { agent any stages { - stage('') { + stage('error') { steps { echo 'KUKUSIKI' } } + stage('test') { + steps { + echo 'KUKUSIKI 2' + } + } + } } \ No newline at end of file From 9e6cba52f6bdfcc4d917001855b2a06c1ee36807 Mon Sep 17 00:00:00 2001 From: l_deloff Date: Sun, 19 Nov 2023 14:20:11 +0000 Subject: [PATCH 04/75] =?UTF-8?q?=D0=9A=D0=BE=D0=BC=D0=BC=D0=B8=D1=82=20?= =?UTF-8?q?=D0=BE=D1=82=20=D0=A2=D0=A3=D0=97?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index b67d63e..a615651 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,15 +1,9 @@ pipeline { agent any stages { - stage('error') { + stage('Message') { steps { - echo 'KUKUSIKI' - } - } - - stage('test') { - steps { - echo 'KUKUSIKI 2' + echo 'Start build' } } From 5920067b02dd3a23d2555c998a2a26705ac16ec8 Mon Sep 17 00:00:00 2001 From: l_deloff Date: Sun, 19 Nov 2023 14:27:46 +0000 Subject: [PATCH 05/75] =?UTF-8?q?=D1=82=D0=B5=D1=81=D1=82=D1=8E=20=D0=B1?= =?UTF-8?q?=D0=B8=D0=BB=D0=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/Jenkinsfile b/Jenkinsfile index a615651..cb2a86f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -7,5 +7,17 @@ pipeline { } } + stage('Build') { + steps { + sh 'mvn -B -DskipTests clean package' + } + } + + stage('Test') { + steps { + sh 'mvn test' + } + } + } } \ No newline at end of file From f011205a2241c6694477815bdf62fcf06ab30cd3 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 17:32:19 +0300 Subject: [PATCH 06/75] =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cb2a86f..380fd89 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,5 +1,10 @@ pipeline { - agent any + agent { + docker { + image 'maven:3.9.5-eclipse-temurin-17-alpine' + args '-v /root/.m2:/root/.m2' + } + } stages { stage('Message') { steps { From f9ad7fddbdaaf98b20f195859f63fecb3617fc81 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 17:38:39 +0300 Subject: [PATCH 07/75] =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 380fd89..0c0dc51 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -6,11 +6,6 @@ pipeline { } } stages { - stage('Message') { - steps { - echo 'Start build' - } - } stage('Build') { steps { From c84e935f05c01a5395b308dfe97209cf5e253b2e Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 17:54:15 +0300 Subject: [PATCH 08/75] =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 0c0dc51..718fa05 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,23 +1,27 @@ pipeline { agent { - docker { - image 'maven:3.9.5-eclipse-temurin-17-alpine' - args '-v /root/.m2:/root/.m2' - } - } - stages { - - stage('Build') { - steps { - sh 'mvn -B -DskipTests clean package' + docker { + image 'openjdk:11.0.5-slim' + args '-v $HOME/.m2:/root/.m2' } } - - stage('Test') { - steps { - sh 'mvn test' + stages { + stage('Build') { + steps { + checkout scm + sh './mvnw compile' + } + } + stage('Test') { + steps { + sh './mvnw test' + junit '**/target/surefire-reports/TEST-*.xml' + } + } + stage('Package') { + steps { + sh './mvnw package -DskipTests' + } } - } - } } \ No newline at end of file From 6359c59af9f062a0f2f2ad09765c52727eae48d2 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 18:07:57 +0300 Subject: [PATCH 09/75] =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 30 +++++++++--------------------- 1 file changed, 9 insertions(+), 21 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 718fa05..e355811 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,27 +1,15 @@ pipeline { agent { - docker { - image 'openjdk:11.0.5-slim' - args '-v $HOME/.m2:/root/.m2' + docker { + image 'maven:3.9.5-eclipse-temurin-17-alpine' + args '-v /root/.m2:/root/.m2' } - } - stages { - stage('Build') { - steps { - checkout scm - sh './mvnw compile' - } - } - stage('Test') { - steps { - sh './mvnw test' - junit '**/target/surefire-reports/TEST-*.xml' - } - } - stage('Package') { - steps { - sh './mvnw package -DskipTests' - } + } + stages { + stage('Build') { + steps { + sh 'mvn -B -DskipTests clean package' + } } } } \ No newline at end of file From d60187cc077aae4008dda5517d68371a994dd5b3 Mon Sep 17 00:00:00 2001 From: l_deloff Date: Sun, 19 Nov 2023 15:10:55 +0000 Subject: [PATCH 10/75] test --- Jenkinsfile | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index e355811..1f19e0c 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,15 +1,17 @@ pipeline { agent { docker { - image 'maven:3.9.5-eclipse-temurin-17-alpine' - args '-v /root/.m2:/root/.m2' - } + image 'maven:3.9.5-eclipse-temurin-17-alpine' + args '-v /root/.m2:/root/.m2' + } + } stages { stage('Build') { - steps { - sh 'mvn -B -DskipTests clean package' - } + steps { + sh 'mvn -B clean install' } + } + } } \ No newline at end of file From 02a56ee4340b18c5230f66da3269807187e0a0ab Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 20:29:09 +0300 Subject: [PATCH 11/75] =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1f19e0c..7842213 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { docker { - image 'maven:3.9.5-eclipse-temurin-17-alpine' + image 'maven' args '-v /root/.m2:/root/.m2' } From 7838e60a8289bd1fccbd5fcfdc94593fec7e973d Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 20:31:37 +0300 Subject: [PATCH 12/75] =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7842213..50a6677 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,11 +1,10 @@ pipeline { agent { - docker { - image 'maven' - args '-v /root/.m2:/root/.m2' + docker { + image 'openjdk:11.0.5-slim' + args '-v $HOME/.m2:/root/.m2' + } } - - } stages { stage('Build') { steps { From edd29ea029fe88c968f320cdc13f484f95537a05 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 20:33:11 +0300 Subject: [PATCH 13/75] =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 50a6677..1844731 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,12 +5,23 @@ pipeline { args '-v $HOME/.m2:/root/.m2' } } - stages { - stage('Build') { - steps { - sh 'mvn -B clean install' + stages { + stage('Build') { + steps { + checkout scm + sh './mvnw compile' + } + } + stage('Test') { + steps { + sh './mvnw test' + junit '**/target/surefire-reports/TEST-*.xml' + } + } + stage('Package') { + steps { + sh './mvnw package -DskipTests' + } } } - - } -} \ No newline at end of file + } \ No newline at end of file From 9a4652b8f2584c854fa0bda1f8c87c2ad7044aa9 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 20:40:53 +0300 Subject: [PATCH 14/75] =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile b/Jenkinsfile index 1844731..c5fa6dd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,6 +9,7 @@ pipeline { stage('Build') { steps { checkout scm + sh 'ls' sh './mvnw compile' } } From 0ac12deed36670f6b0748c3d968ee9af14ff5c9e Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 20:45:21 +0300 Subject: [PATCH 15/75] =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c5fa6dd..033f7c1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { docker { - image 'openjdk:11.0.5-slim' + image 'maven:3.8-openjdk-18' args '-v $HOME/.m2:/root/.m2' } } From 742d246cdbf08bc613de4f7bb45372a41d366a4e Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 21:53:21 +0300 Subject: [PATCH 16/75] =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 033f7c1..dc02830 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -9,7 +9,6 @@ pipeline { stage('Build') { steps { checkout scm - sh 'ls' sh './mvnw compile' } } From 0f9721f562e4558b25fd4bb1d3c8d19eff837312 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 22:02:30 +0300 Subject: [PATCH 17/75] =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 32 ++++++++++---------------------- 1 file changed, 10 insertions(+), 22 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index dc02830..c5b9a4a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,27 +1,15 @@ pipeline { - agent { - docker { - image 'maven:3.8-openjdk-18' - args '-v $HOME/.m2:/root/.m2' - } + agent { + docker { + image 'maven:3.9.5-eclipse-temurin-17-alpine' + args '-v /root/.m2:/root/.m2' + } } stages { - stage('Build') { - steps { - checkout scm - sh './mvnw compile' + stage('Build') { + steps { + sh 'mvn -B -DskipTests clean package' + } } - } - stage('Test') { - steps { - sh './mvnw test' - junit '**/target/surefire-reports/TEST-*.xml' - } - } - stage('Package') { - steps { - sh './mvnw package -DskipTests' - } - } } - } \ No newline at end of file +} \ No newline at end of file From dc075916127e79b376a65a7a8868b619a71b1726 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 22:03:19 +0300 Subject: [PATCH 18/75] =?UTF-8?q?=D0=B0=D0=B3=D0=B5=D0=BD=D1=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index c5b9a4a..1874157 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { docker { - image 'maven:3.9.5-eclipse-temurin-17-alpine' + image 'maven' args '-v /root/.m2:/root/.m2' } } From fd39b88296f9c2fd02a2affaf06a10a0e9bdcf89 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 22:12:16 +0300 Subject: [PATCH 19/75] fix --- pom.xml | 9 --------- 1 file changed, 9 deletions(-) diff --git a/pom.xml b/pom.xml index 60d4474..d68239f 100644 --- a/pom.xml +++ b/pom.xml @@ -124,15 +124,6 @@ - - - build-image - package - - build - - - From 9ef9ad18cfceb3adf12b58c265243f2e8115a4fd Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 22:15:16 +0300 Subject: [PATCH 20/75] fix --- pom.xml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pom.xml b/pom.xml index d68239f..f1102b5 100644 --- a/pom.xml +++ b/pom.xml @@ -16,9 +16,9 @@ 17 9.16.0 - ${db.url} - ${db.username} - ${db.password} + ${database.url} + ${database.username} + ${database.password} From 02a4b5081f75073c14da631434b4d610d14e0dfe Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 22:16:52 +0300 Subject: [PATCH 21/75] log errors --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 1874157..fb00cbc 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { stages { stage('Build') { steps { - sh 'mvn -B -DskipTests clean package' + sh 'mvn -B -DskipTests -X clean package' } } } From 0863650ddc937cdc1e04bee062c7d1d50d00be90 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Sun, 19 Nov 2023 22:20:29 +0300 Subject: [PATCH 22/75] log errors --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index fb00cbc..ea279f6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -1,7 +1,7 @@ pipeline { agent { docker { - image 'maven' + image 'maven:3.9.5-eclipse-temurin-17' args '-v /root/.m2:/root/.m2' } } From 56a74a8b4954840df4576a0217d41214692daa46 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 19:52:32 +0300 Subject: [PATCH 23/75] =?UTF-8?q?=D0=94=D0=BE=D0=B1=D0=B0=D0=B2=D0=B8?= =?UTF-8?q?=D0=BB=20=D1=81=D1=82=D0=B0=D0=B4=D0=B8=D1=8E=20=D1=82=D0=B5?= =?UTF-8?q?=D1=81=D1=82=D0=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index ea279f6..7dba488 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,17 @@ pipeline { stages { stage('Build') { steps { - sh 'mvn -B -DskipTests -X clean package' + sh 'mvn -B -DskipTests -X clean install' + } + } + stage('Test') { + steps { + sh 'mvn test' + } + } + stage('Build docker') { + steps { + sh 'mvn test' } } } From 7a0c2fde66e4c31112214454f313016a742848ca Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 19:54:58 +0300 Subject: [PATCH 24/75] fix --- Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index 7dba488..898fddd 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,7 +8,7 @@ pipeline { stages { stage('Build') { steps { - sh 'mvn -B -DskipTests -X clean install' + sh 'mvn -B -DskipTests -X clean package' } } stage('Test') { From ecfd0a9ae571ddd7a08c16a9e69ea6f766077729 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 19:59:20 +0300 Subject: [PATCH 25/75] build docker stage --- Jenkinsfile | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 898fddd..cc197c1 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -11,14 +11,10 @@ pipeline { sh 'mvn -B -DskipTests -X clean package' } } - stage('Test') { - steps { - sh 'mvn test' - } - } stage('Build docker') { + agent any steps { - sh 'mvn test' + sh 'docker build -t ldeloff/servermonitorbot:latest .' } } } From ead94bea2fc80258ac1aff482ca466e2b81c185f Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 20:06:34 +0300 Subject: [PATCH 26/75] build docker stage --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index e4f35b0..3b04360 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Используем официальный образ OpenJDK 17 как базовый образ -FROM openjdk:17-jre-slim +FROM openjdk:17 # Установка рабочей директории внутри контейнера WORKDIR /app From 3b505398e43254209b2a89f5fbc646a48a49f4d5 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 20:08:55 +0300 Subject: [PATCH 27/75] build docker stage --- Jenkinsfile | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/Jenkinsfile b/Jenkinsfile index cc197c1..af40db6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -8,12 +8,14 @@ pipeline { stages { stage('Build') { steps { + sh 'ls' sh 'mvn -B -DskipTests -X clean package' } } stage('Build docker') { - agent any steps { + sh 'ls' + sh 'ls target' sh 'docker build -t ldeloff/servermonitorbot:latest .' } } From 3c53ea17a5d7ecd2d38db3e15f7550bd55ce3c7d Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 20:49:56 +0300 Subject: [PATCH 28/75] CI/CD --- Jenkinsfile_CD | 41 +++++++++++++++++++++++++++++++++++ Jenkinsfile => Jenkinsfile_CI | 3 --- 2 files changed, 41 insertions(+), 3 deletions(-) create mode 100644 Jenkinsfile_CD rename Jenkinsfile => Jenkinsfile_CI (84%) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD new file mode 100644 index 0000000..1125f02 --- /dev/null +++ b/Jenkinsfile_CD @@ -0,0 +1,41 @@ +pipeline { + agent { + docker { + image 'maven:3.9.5-eclipse-temurin-17' + args '-v /root/.m2:/root/.m2' + } + } + + environment { + SSH_HOST = credentials('SSH_HOST') + SSH_PORT = credentials('SSH_PORT') + SSH_USER = credentials('SSH_USER') + SSH_PASS = credentials('SSH_PASS') + PATH_TO_DEV_FOLDER = credentials('PATH_TO_DEV_FOLDER') + IMAGE_NAME = servermonitorbot + IMAGE_VERSION = latest + } + + stages { + stage('Build') { + steps { + sh 'mvn -B -DskipTests -X clean package' + } + } + 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}' + scp -o StrictHostKeyChecking=no -P ${SSH_PORT} target/*.jar ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ + scp -o StrictHostKeyChecking=no -P ${SSH_PORT} Dockerfile ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ + scp -o StrictHostKeyChecking=no -P ${SSH_PORT} docker-compose.yml ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ + ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker build -t ${IMAGE_NAME}:${IMAGE_VERSION} .' + ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker-compose up -d' + """ + } + } + } + } + } +} \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile_CI similarity index 84% rename from Jenkinsfile rename to Jenkinsfile_CI index af40db6..c7ed1b4 100644 --- a/Jenkinsfile +++ b/Jenkinsfile_CI @@ -8,14 +8,11 @@ pipeline { stages { stage('Build') { steps { - sh 'ls' sh 'mvn -B -DskipTests -X clean package' } } stage('Build docker') { steps { - sh 'ls' - sh 'ls target' sh 'docker build -t ldeloff/servermonitorbot:latest .' } } From a6151fb01ea0a3025c3e5b7c73bdc1b7321c106a Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 20:53:40 +0300 Subject: [PATCH 29/75] CI/CD fix --- Jenkinsfile_CD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 1125f02..03aaa52 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -33,9 +33,9 @@ pipeline { ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker build -t ${IMAGE_NAME}:${IMAGE_VERSION} .' ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker-compose up -d' """ - } } } } } -} \ No newline at end of file +} + From 11c0b4f36919cbce7666c821af787075b61fb2a7 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 20:55:01 +0300 Subject: [PATCH 30/75] CI/CD fix --- Jenkinsfile_CD | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 03aaa52..3da5555 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -12,8 +12,8 @@ pipeline { SSH_USER = credentials('SSH_USER') SSH_PASS = credentials('SSH_PASS') PATH_TO_DEV_FOLDER = credentials('PATH_TO_DEV_FOLDER') - IMAGE_NAME = servermonitorbot - IMAGE_VERSION = latest + IMAGE_NAME = 'servermonitorbot' + IMAGE_VERSION = 'latest' } stages { From 182f850a3b9ece8bacec7f0c073c905ad46f357d Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 20:58:23 +0300 Subject: [PATCH 31/75] CI/CD fix --- Jenkinsfile_CD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 3da5555..b406883 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -26,7 +26,7 @@ pipeline { 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} 'mkdir -p ${PATH_TO_DEV_FOLDER}' scp -o StrictHostKeyChecking=no -P ${SSH_PORT} target/*.jar ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ scp -o StrictHostKeyChecking=no -P ${SSH_PORT} Dockerfile ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ scp -o StrictHostKeyChecking=no -P ${SSH_PORT} docker-compose.yml ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ From d56b5a56172b5cfa68182867485c97656a0a05ae Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 20:59:34 +0300 Subject: [PATCH 32/75] CI/CD fix --- Jenkinsfile_CD | 1 - 1 file changed, 1 deletion(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index b406883..cc40578 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -26,7 +26,6 @@ pipeline { steps { script { sh """ - //sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'mkdir -p ${PATH_TO_DEV_FOLDER}' scp -o StrictHostKeyChecking=no -P ${SSH_PORT} target/*.jar ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ scp -o StrictHostKeyChecking=no -P ${SSH_PORT} Dockerfile ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ scp -o StrictHostKeyChecking=no -P ${SSH_PORT} docker-compose.yml ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ From bdb19c81ca1e535005ba14660b95c66f07489e09 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 21:06:00 +0300 Subject: [PATCH 33/75] CI/CD fix --- Jenkinsfile_CD | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index cc40578..2553cdf 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -25,7 +25,11 @@ 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}' scp -o StrictHostKeyChecking=no -P ${SSH_PORT} target/*.jar ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ scp -o StrictHostKeyChecking=no -P ${SSH_PORT} Dockerfile ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ scp -o StrictHostKeyChecking=no -P ${SSH_PORT} docker-compose.yml ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ From 0ba76e16b24a79d487f48f1f5d24b9ae43e67f9a Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 21:17:34 +0300 Subject: [PATCH 34/75] CI/CD fix --- Jenkinsfile_CD | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 2553cdf..6886934 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -30,11 +30,11 @@ pipeline { sh """ sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'mkdir -p ${PATH_TO_DEV_FOLDER}' - scp -o StrictHostKeyChecking=no -P ${SSH_PORT} target/*.jar ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ - scp -o StrictHostKeyChecking=no -P ${SSH_PORT} Dockerfile ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ - scp -o StrictHostKeyChecking=no -P ${SSH_PORT} docker-compose.yml ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/ - ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker build -t ${IMAGE_NAME}:${IMAGE_VERSION} .' - ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker-compose up -d' + 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' """ } } From 008b173b7053a2a1612b997d481c779dce701b50 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 21:19:20 +0300 Subject: [PATCH 35/75] CI/CD fix --- Jenkinsfile_CD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 6886934..85c9bdf 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -30,7 +30,7 @@ pipeline { 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}/ + sshpass -p ${SSH_PASS} scp -o StrictHostKeyChecking=no -P ${SSH_PORT} target/*.jar ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/target 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} .' From 94285d88b7f5b3bb493040a1fe7245df917c92ad Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 21:20:56 +0300 Subject: [PATCH 36/75] CI/CD fix --- Jenkinsfile_CD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 85c9bdf..9f57e91 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -30,7 +30,7 @@ pipeline { 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}/target + sshpass -p ${SSH_PASS} scp -o StrictHostKeyChecking=no -P ${SSH_PORT} target/*.jar ${SSH_USER}@${SSH_HOST}:${PATH_TO_DEV_FOLDER}/target/ 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} .' From 74078b120c140beab662f89c622693c78c8d859a Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 21:22:50 +0300 Subject: [PATCH 37/75] CI/CD fix --- Dockerfile | 2 +- Jenkinsfile_CD | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 3b04360..b72c51b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,7 @@ 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"] \ No newline at end of file diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 9f57e91..6886934 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -30,7 +30,7 @@ pipeline { 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}/target/ + 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} .' From b68520ffa4c5ec4aba755c8563c8927b9102b8d6 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 21:25:10 +0300 Subject: [PATCH 38/75] CI/CD fix --- Jenkinsfile_CD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 6886934..df54b53 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -34,7 +34,7 @@ pipeline { 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' + sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'cd ${PATH_TO_DEV_FOLDER} && docker compose up -d' """ } } From 051e201525221d6f8a27535c405f5ad8b67890e8 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 21:30:28 +0300 Subject: [PATCH 39/75] CI/CD fix --- pom.xml | 39 ++++++++++++++------------------------- 1 file changed, 14 insertions(+), 25 deletions(-) diff --git a/pom.xml b/pom.xml index f1102b5..ba60177 100644 --- a/pom.xml +++ b/pom.xml @@ -91,38 +91,27 @@ - ${db.url} - ${db.username} - ${db.password} + ${database.url} + ${database.username} + ${database.password} classpath:db/migration - com.spotify - docker-maven-plugin - 1.2.0 - - - build-image - install - - build - - - + + org.apache.maven.plugins + maven-jar-plugin + 3.1.0 - ServerMonitorBot - remote-docker - . - - - / - ${project.build.directory} - ${project.build.finalName}.jar - - + + + true + lib/ + ru.ldeloff.servermonitorbot.ServerMonitorBotApplication + + From 8bdc56bd8aa875bdb9b24e7e137cc53fe172e8de Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 21:32:28 +0300 Subject: [PATCH 40/75] CI/CD fix --- Jenkinsfile_CD | 2 +- Jenkinsfile_CI | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index df54b53..87ea5d9 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -19,7 +19,7 @@ pipeline { stages { stage('Build') { steps { - sh 'mvn -B -DskipTests -X clean package' + sh 'mvn -B -DskipTests -X clean install' } } stage('Deploy') { diff --git a/Jenkinsfile_CI b/Jenkinsfile_CI index c7ed1b4..1705ce0 100644 --- a/Jenkinsfile_CI +++ b/Jenkinsfile_CI @@ -8,7 +8,7 @@ pipeline { stages { stage('Build') { steps { - sh 'mvn -B -DskipTests -X clean package' + sh 'mvn -B -DskipTests -X clean install' } } stage('Build docker') { From 98bc9633be6392244dea25c9b839044b9a2469f0 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 21:47:54 +0300 Subject: [PATCH 41/75] CI/CD fix --- Jenkinsfile_CD | 2 +- Jenkinsfile_CI | 2 +- pom.xml | 23 ++++++++++++----------- src/main/resources/application.yml | 6 +++--- 4 files changed, 17 insertions(+), 16 deletions(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 87ea5d9..07e1a36 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -19,7 +19,7 @@ pipeline { stages { stage('Build') { steps { - sh 'mvn -B -DskipTests -X clean install' + sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' } } stage('Deploy') { diff --git a/Jenkinsfile_CI b/Jenkinsfile_CI index 1705ce0..aad584a 100644 --- a/Jenkinsfile_CI +++ b/Jenkinsfile_CI @@ -8,7 +8,7 @@ pipeline { stages { stage('Build') { steps { - sh 'mvn -B -DskipTests -X clean install' + sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' } } stage('Build docker') { diff --git a/pom.xml b/pom.xml index ba60177..d8cbe86 100644 --- a/pom.xml +++ b/pom.xml @@ -19,6 +19,7 @@ ${database.url} ${database.username} ${database.password} + ru.ldeloff.servermonitorbot.ServerMonitorBotApplication @@ -100,19 +101,19 @@ - - org.apache.maven.plugins - maven-jar-plugin - 3.1.0 + org.springframework.boot + spring-boot-maven-plugin - - - true - lib/ - ru.ldeloff.servermonitorbot.ServerMonitorBotApplication - - + ru.ldeloff.servermonitorbot.ServerMonitorBotApplication + JAR + + + + repackage + + + diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 21fe203..023e736 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,9 +2,9 @@ spring: application: name: ServerMonitorBot datasource: - url: @db.url@ - username: @db.username@ - password: @db.password@ + url: @database.url@ + username: @database.username@ + password: @database.password@ jpa: hibernate: ddl-auto: none From 204dbc5f73797ef7cb921177e279d3f3fcf9c01c Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 21:50:45 +0300 Subject: [PATCH 42/75] CI/CD fix --- Jenkinsfile_CI | 5 ----- 1 file changed, 5 deletions(-) diff --git a/Jenkinsfile_CI b/Jenkinsfile_CI index aad584a..5cf3091 100644 --- a/Jenkinsfile_CI +++ b/Jenkinsfile_CI @@ -11,10 +11,5 @@ pipeline { sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' } } - stage('Build docker') { - steps { - sh 'docker build -t ldeloff/servermonitorbot:latest .' - } - } } } \ No newline at end of file From 94485ab9d24b44353611d2c8c8406ea06670eb3c Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 22:02:23 +0300 Subject: [PATCH 43/75] CI/CD fix --- Jenkinsfile_CD | 5 ++++- Jenkinsfile_CI | 5 ++++- pom.xml | 4 ---- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 07e1a36..9d70445 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -19,7 +19,10 @@ pipeline { stages { stage('Build') { steps { - sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' + configFileProvider( + [configFile(fileId: 'maven-settings', variable: 'SETTINGS_XML_GLOBAL')]) { + sh 'mvn -B -DskipTests -X -s $MAVEN_SETTINGS clean package spring-boot:repackage' + } } } stage('Deploy') { diff --git a/Jenkinsfile_CI b/Jenkinsfile_CI index 5cf3091..16fefce 100644 --- a/Jenkinsfile_CI +++ b/Jenkinsfile_CI @@ -8,7 +8,10 @@ pipeline { stages { stage('Build') { steps { - sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' + configFileProvider( + [configFile(fileId: 'maven-settings', variable: 'SETTINGS_XML_GLOBAL')]) { + sh 'mvn -B -DskipTests -X -s $MAVEN_SETTINGS clean package spring-boot:repackage' + } } } } diff --git a/pom.xml b/pom.xml index d8cbe86..e69b633 100644 --- a/pom.xml +++ b/pom.xml @@ -103,10 +103,6 @@ org.springframework.boot spring-boot-maven-plugin - - ru.ldeloff.servermonitorbot.ServerMonitorBotApplication - JAR - From a20b0c4963c6980712188ed7bcdc784ff7c7eaea Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 22:07:30 +0300 Subject: [PATCH 44/75] CI/CD fix --- Jenkinsfile_CD | 5 +---- Jenkinsfile_CI | 5 +---- docker-compose.yml | 9 ++++++++- src/main/resources/application.yml | 6 +++--- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 9d70445..07e1a36 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -19,10 +19,7 @@ pipeline { stages { stage('Build') { steps { - configFileProvider( - [configFile(fileId: 'maven-settings', variable: 'SETTINGS_XML_GLOBAL')]) { - sh 'mvn -B -DskipTests -X -s $MAVEN_SETTINGS clean package spring-boot:repackage' - } + sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' } } stage('Deploy') { diff --git a/Jenkinsfile_CI b/Jenkinsfile_CI index 16fefce..5cf3091 100644 --- a/Jenkinsfile_CI +++ b/Jenkinsfile_CI @@ -8,10 +8,7 @@ pipeline { stages { stage('Build') { steps { - configFileProvider( - [configFile(fileId: 'maven-settings', variable: 'SETTINGS_XML_GLOBAL')]) { - sh 'mvn -B -DskipTests -X -s $MAVEN_SETTINGS clean package spring-boot:repackage' - } + sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' } } } diff --git a/docker-compose.yml b/docker-compose.yml index e0ec7fc..652f996 100644 --- a/docker-compose.yml +++ b/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 \ No newline at end of file + POSTGRES_DB: servermonitorbot + networks: + default: + +networks: + default: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index 023e736..d69ecb8 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,9 +2,9 @@ spring: application: name: ServerMonitorBot datasource: - url: @database.url@ - username: @database.username@ - password: @database.password@ + url: jdbc:postgresql://db:5432/servermonitorbot + username: servermonitorbot + password: servermonitorbot jpa: hibernate: ddl-auto: none From 34744f93ec340859843d0f97dd0a86f911c09903 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Mon, 20 Nov 2023 22:13:19 +0300 Subject: [PATCH 45/75] CI/CD fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index b72c51b..a0983f7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,4 +8,4 @@ WORKDIR /app COPY ServerMonitorBot-0.0.1-SNAPSHOT.jar app.jar # Команда для запуска Spring Boot приложения при старте контейнера -CMD ["java", "-jar", "app.jar"] \ No newline at end of file +CMD ["java", "-cp", "app.jar", "ru.ldeloff.servermonitorbot.ServerMonitorBotApplication"] \ No newline at end of file From 395da1739b7e42b45411ce8101b2d02b46ffcf47 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 13:28:03 +0300 Subject: [PATCH 46/75] CI/CD fix --- pom.xml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/pom.xml b/pom.xml index e69b633..fdf5c2a 100644 --- a/pom.xml +++ b/pom.xml @@ -70,12 +70,15 @@ - org.apache.maven.plugins - maven-compiler-plugin - 3.8.1 + org.springframework.boot + spring-boot-maven-plugin - ${java.version} - ${java.version} + + + org.projectlombok + lombok + + From bf070c29a1b075f0d33a50f29cc8f78fa03b302b Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 13:33:21 +0300 Subject: [PATCH 47/75] CI/CD fix --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index a0983f7..b72c51b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,4 +8,4 @@ WORKDIR /app COPY ServerMonitorBot-0.0.1-SNAPSHOT.jar app.jar # Команда для запуска Spring Boot приложения при старте контейнера -CMD ["java", "-cp", "app.jar", "ru.ldeloff.servermonitorbot.ServerMonitorBotApplication"] \ No newline at end of file +CMD ["java", "-jar", "app.jar"] \ No newline at end of file From 35a8d6a8c7f20f8c28ecde16e87251b0fa897e72 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 13:43:36 +0300 Subject: [PATCH 48/75] =?UTF-8?q?=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BE=D1=82=20=D0=BD=D0=B5=D0=B8=D1=81=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D0=BC=D1=8B=D1=85=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=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 From de303fcd8eeb3b435b9939fb40c2a4b73446168e Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 13:47:06 +0300 Subject: [PATCH 49/75] =?UTF-8?q?=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BE=D1=82=20=D0=BD=D0=B5=D0=B8=D1=81=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D0=BC=D1=8B=D1=85=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile_CD | 4 +++- Jenkinsfile_CI | 10 +++++++++- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 1634fd5..7a2c03d 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -43,7 +43,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' + sh """ + 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 29b9fcc..a216543 100644 --- a/Jenkinsfile_CI +++ b/Jenkinsfile_CI @@ -5,6 +5,12 @@ pipeline { args '-v /root/.m2:/root/.m2' } } + environment { + SSH_HOST = credentials('SSH_HOST') + SSH_PORT = credentials('SSH_PORT') + SSH_USER = credentials('SSH_USER') + SSH_PASS = credentials('SSH_PASS') + } stages { stage('Build') { steps { @@ -14,7 +20,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' + sh """ + 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 From 28ec8dcd64061b402cf3d77c8150b6f682168786 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 13:50:35 +0300 Subject: [PATCH 50/75] =?UTF-8?q?=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BE=D1=82=20=D0=BD=D0=B5=D0=B8=D1=81=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D0=BC=D1=8B=D1=85=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/db/migration/V001__create_table_users.sql | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/main/resources/db/migration/V001__create_table_users.sql b/src/main/resources/db/migration/V001__create_table_users.sql index e53a200..5a44278 100644 --- a/src/main/resources/db/migration/V001__create_table_users.sql +++ b/src/main/resources/db/migration/V001__create_table_users.sql @@ -2,7 +2,9 @@ --changeset L_DelOff:create_table_users rollbackSplitStatements:true --comment: Создание таблицы пользователей -CREATE SCHEMA servermonitorbot; + +--CREATE SCHEMA servermonitorbot; + CREATE TABLE users ( id SERIAL PRIMARY KEY, From 07b27cb6de659005f06069f7e539e9dc71e574af Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 13:53:25 +0300 Subject: [PATCH 51/75] =?UTF-8?q?=D0=BE=D1=87=D0=B8=D1=81=D1=82=D0=BA?= =?UTF-8?q?=D0=B0=20=D0=BE=D1=82=20=D0=BD=D0=B5=D0=B8=D1=81=D0=BF=D0=BE?= =?UTF-8?q?=D0=BB=D1=8C=D0=B7=D1=83=D0=B5=D0=BC=D1=8B=D1=85=20=D0=BE=D0=B1?= =?UTF-8?q?=D1=80=D0=B0=D0=B7=D0=BE=D0=B2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/db/migration/V001__create_table_users.sql | 4 +--- src/main/resources/db/migration/V002__create_table_roles.sql | 2 -- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/src/main/resources/db/migration/V001__create_table_users.sql b/src/main/resources/db/migration/V001__create_table_users.sql index 5a44278..496a8b5 100644 --- a/src/main/resources/db/migration/V001__create_table_users.sql +++ b/src/main/resources/db/migration/V001__create_table_users.sql @@ -1,9 +1,7 @@ ---liquibase formatted sql - --changeset L_DelOff:create_table_users rollbackSplitStatements:true --comment: Создание таблицы пользователей ---CREATE SCHEMA servermonitorbot; +--comment: CREATE SCHEMA servermonitorbot; CREATE TABLE users ( diff --git a/src/main/resources/db/migration/V002__create_table_roles.sql b/src/main/resources/db/migration/V002__create_table_roles.sql index e7d5fad..76c5559 100644 --- a/src/main/resources/db/migration/V002__create_table_roles.sql +++ b/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 From 034387af16d93b338f9ffc00b4de29f5b4fba2fe Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 13:57:58 +0300 Subject: [PATCH 52/75] fix --- Jenkinsfile_CD | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 7a2c03d..aba7d30 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -32,6 +32,7 @@ pipeline { 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 -r ${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}/ From 0fecaa501b63e19444f1581aa0150ce09649d263 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 13:59:29 +0300 Subject: [PATCH 53/75] fix --- Jenkinsfile_CI | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/Jenkinsfile_CI b/Jenkinsfile_CI index a216543..412ed8b 100644 --- a/Jenkinsfile_CI +++ b/Jenkinsfile_CI @@ -17,12 +17,13 @@ pipeline { 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' - """ + stage('Prune images') { + steps { + sh """ + 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 From d822059e4e5053d37195d893c5197fafcaf15a76 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 14:00:18 +0300 Subject: [PATCH 54/75] fix --- Jenkinsfile_CD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index aba7d30..7835ddc 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -32,7 +32,7 @@ pipeline { 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 -r ${PATH_TO_DEV_FOLDER}/' + sshpass -p ${SSH_PASS} ssh -o StrictHostKeyChecking=no ${SSH_USER}@${SSH_HOST} -p ${SSH_PORT} 'rm -r ${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}/ From 7d929254ddbcf894972ea3f65b67d8842e785633 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 14:02:48 +0300 Subject: [PATCH 55/75] fix --- Jenkinsfile_CD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 7835ddc..e77fce8 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -32,7 +32,7 @@ pipeline { 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 -r ${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}/ From 754ae6771434b5f09e7064a036ac4edbd5c90ff5 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 14:05:11 +0300 Subject: [PATCH 56/75] fix --- src/main/resources/db/migration/V001__create_table_users.sql | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/main/resources/db/migration/V001__create_table_users.sql b/src/main/resources/db/migration/V001__create_table_users.sql index 496a8b5..058d3f4 100644 --- a/src/main/resources/db/migration/V001__create_table_users.sql +++ b/src/main/resources/db/migration/V001__create_table_users.sql @@ -1,8 +1,5 @@ --changeset L_DelOff:create_table_users rollbackSplitStatements:true --comment: Создание таблицы пользователей - ---comment: CREATE SCHEMA servermonitorbot; - CREATE TABLE users ( id SERIAL PRIMARY KEY, From 8b8833cd2b7f8e81c9d4da8699c7af13f23f46a7 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 17:53:32 +0300 Subject: [PATCH 57/75] fix --- Jenkinsfile_CD | 10 +++++----- Jenkinsfile_CI | 8 ++++---- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index e77fce8..261dd6d 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -7,11 +7,11 @@ pipeline { } environment { - SSH_HOST = credentials('SSH_HOST') - SSH_PORT = credentials('SSH_PORT') - SSH_USER = credentials('SSH_USER') - SSH_PASS = credentials('SSH_PASS') - PATH_TO_DEV_FOLDER = credentials('PATH_TO_DEV_FOLDER') + 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' } diff --git a/Jenkinsfile_CI b/Jenkinsfile_CI index 412ed8b..1858239 100644 --- a/Jenkinsfile_CI +++ b/Jenkinsfile_CI @@ -6,10 +6,10 @@ pipeline { } } environment { - SSH_HOST = credentials('SSH_HOST') - SSH_PORT = credentials('SSH_PORT') - SSH_USER = credentials('SSH_USER') - SSH_PASS = credentials('SSH_PASS') + 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') { From 431e7779889c9e50c40507693c3376d921f3eaa7 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 22:15:43 +0300 Subject: [PATCH 58/75] add application.yml --- Jenkinsfile_CD | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 261dd6d..c0a0d4d 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -24,6 +24,9 @@ pipeline { } 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' } } From 757850aae6bd338dff85ad1d4dbfd6aeb89bf264 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 22:16:55 +0300 Subject: [PATCH 59/75] fix --- Jenkinsfile_CD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index c0a0d4d..6231a10 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -25,7 +25,7 @@ pipeline { stage('Build') { steps { withCredentials([file(credentialsId: 'SERVERMONITORBOT_APPLICATION_YAML', variable: 'application_yaml')]) { - sh "cp \$application_yaml /src/main/resources/application.yml" + sh "cp \$application_yaml src/main/resources/application.yml" } sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' } From 9849a46a4058e4792c004086235096659d760332 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 22:22:40 +0300 Subject: [PATCH 60/75] fix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index fdf5c2a..3f3a189 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,7 @@ org.telegram telegrambots - 6.7.0 + 6.8.0 com.jcraft From e259bb02622058342b2db269f63cb24d12641d07 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 22:32:46 +0300 Subject: [PATCH 61/75] fix --- docker-compose.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/docker-compose.yml b/docker-compose.yml index 652f996..3bdeb0f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,6 +14,7 @@ services: POSTGRES_USER: servermonitorbot POSTGRES_PASSWORD: servermonitorbot POSTGRES_DB: servermonitorbot + network_mode: host networks: default: From 23effc5fe6d388e200c284976fdae29e64f469b5 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 22:49:46 +0300 Subject: [PATCH 62/75] fix --- docker-compose.yml | 1 - src/main/resources/application.yml | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3bdeb0f..652f996 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -14,7 +14,6 @@ services: POSTGRES_USER: servermonitorbot POSTGRES_PASSWORD: servermonitorbot POSTGRES_DB: servermonitorbot - network_mode: host networks: default: diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index d69ecb8..b0a7e81 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,9 +2,9 @@ spring: application: name: ServerMonitorBot datasource: - url: jdbc:postgresql://db:5432/servermonitorbot - username: servermonitorbot - password: servermonitorbot + url: jdbc:postgresql://test:5432/servermonitorbot + username: test + password: test jpa: hibernate: ddl-auto: none From 5d4370d932c922e60dc849f03490b093b9232652 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 22:52:17 +0300 Subject: [PATCH 63/75] fix --- Jenkinsfile_CD | 2 ++ src/main/resources/application.yml | 6 +++--- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 6231a10..2f1c28b 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -26,6 +26,8 @@ pipeline { 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 'mvn -B -DskipTests -X clean package spring-boot:repackage' } diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml index b0a7e81..d69ecb8 100644 --- a/src/main/resources/application.yml +++ b/src/main/resources/application.yml @@ -2,9 +2,9 @@ spring: application: name: ServerMonitorBot datasource: - url: jdbc:postgresql://test:5432/servermonitorbot - username: test - password: test + url: jdbc:postgresql://db:5432/servermonitorbot + username: servermonitorbot + password: servermonitorbot jpa: hibernate: ddl-auto: none From 386dceed36365abd9a7fe4a4f171fcc6267f82ea Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 22:52:56 +0300 Subject: [PATCH 64/75] fix --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 3f3a189..9ecb466 100644 --- a/pom.xml +++ b/pom.xml @@ -5,7 +5,7 @@ org.springframework.boot spring-boot-starter-parent - 3.1.2 + 3.1.3 ru.ldeloff From 3a0866dfa449a06b110eb0ebd1bf4b2fbaf46444 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 22:54:57 +0300 Subject: [PATCH 65/75] fix --- Jenkinsfile_CD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 2f1c28b..db6ff91 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -25,7 +25,7 @@ pipeline { stage('Build') { steps { withCredentials([file(credentialsId: 'SERVERMONITORBOT_APPLICATION_YAML', variable: 'application_yaml')]) { - sh "cp \$application_yaml src/main/resources/application.yml" + sh "cp -f \$application_yaml src/main/resources/application.yml" sh "ls" sh "ls -lh src/main/resources/" } From 2b782867c98c85e9dd1005b93ff27a38927fde01 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 22:57:56 +0300 Subject: [PATCH 66/75] fix --- Jenkinsfile_CD | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index db6ff91..a56dff4 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -26,8 +26,6 @@ pipeline { steps { withCredentials([file(credentialsId: 'SERVERMONITORBOT_APPLICATION_YAML', variable: 'application_yaml')]) { sh "cp -f \$application_yaml src/main/resources/application.yml" - sh "ls" - sh "ls -lh src/main/resources/" } sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' } @@ -41,7 +39,7 @@ 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 -t --no-cache ${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' """ } From 38a989e2236c835b5de56d639afd9949f8e93dc5 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 22:59:24 +0300 Subject: [PATCH 67/75] fix --- Jenkinsfile_CD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index a56dff4..a354591 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -39,7 +39,7 @@ 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 --no-cache ${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' """ } From bac9f840923737ca824adea908d8d1d452b3d5d0 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 23:01:20 +0300 Subject: [PATCH 68/75] fix --- Jenkinsfile_CI | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/Jenkinsfile_CI b/Jenkinsfile_CI index 1858239..35c497f 100644 --- a/Jenkinsfile_CI +++ b/Jenkinsfile_CI @@ -12,6 +12,11 @@ pipeline { SSH_PASS = credentials('ROCK_PI_5_SSH_PASS') } 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' From c8ff9725e5ac03db81578b9302c9dc2b416f2a68 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 23:02:25 +0300 Subject: [PATCH 69/75] fix --- Jenkinsfile_CD | 1 + 1 file changed, 1 insertion(+) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index a354591..f040483 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -26,6 +26,7 @@ pipeline { steps { withCredentials([file(credentialsId: 'SERVERMONITORBOT_APPLICATION_YAML', variable: 'application_yaml')]) { sh "cp -f \$application_yaml src/main/resources/application.yml" + sh "cat src/main/resources/application.yml" } sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' } From 43958b0d7c79535bc928bbeb8038e04e0f1e79cc Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 23:06:14 +0300 Subject: [PATCH 70/75] fix --- Jenkinsfile_CD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index f040483..1874d63 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -26,7 +26,6 @@ pipeline { steps { withCredentials([file(credentialsId: 'SERVERMONITORBOT_APPLICATION_YAML', variable: 'application_yaml')]) { sh "cp -f \$application_yaml src/main/resources/application.yml" - sh "cat src/main/resources/application.yml" } sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' } @@ -40,6 +39,7 @@ 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' """ From dcd357c6e01c76ec9eeb0596d658b285318d5cbd Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 23:07:59 +0300 Subject: [PATCH 71/75] fix --- Jenkinsfile_CD | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 1874d63..406038f 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -39,7 +39,7 @@ 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 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' """ From e416a84bf7e57ed9193f31fb8667179b78260841 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 23:13:21 +0300 Subject: [PATCH 72/75] fix --- Jenkinsfile_CD | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index 406038f..3494176 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -24,8 +24,11 @@ pipeline { } stage('Build') { steps { + sh "rm -f src/main/resources/application.yml" withCredentials([file(credentialsId: 'SERVERMONITORBOT_APPLICATION_YAML', variable: 'application_yaml')]) { sh "cp -f \$application_yaml src/main/resources/application.yml" + sh "ls -lh" + sh "ls -lh src/main/resources" } sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' } From 1a1fca9325f9db6c4e9d0de75aed787b49f17cee Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 23:21:34 +0300 Subject: [PATCH 73/75] 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' """ } } From 180e1e6be48ec28bd66dbd211b7ad48327f27273 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Tue, 21 Nov 2023 23:21:59 +0300 Subject: [PATCH 74/75] fix --- Jenkinsfile_CD | 3 --- 1 file changed, 3 deletions(-) diff --git a/Jenkinsfile_CD b/Jenkinsfile_CD index c9c5350..8a49b26 100644 --- a/Jenkinsfile_CD +++ b/Jenkinsfile_CD @@ -24,11 +24,8 @@ pipeline { } stage('Build') { steps { - sh "rm -f src/main/resources/application.yml" withCredentials([file(credentialsId: 'SERVERMONITORBOT_APPLICATION_YAML', variable: 'application_yaml')]) { sh "cp -f \$application_yaml src/main/resources/application.yml" - sh "ls -lh" - sh "ls -lh src/main/resources" } sh 'mvn -B -DskipTests -X clean package spring-boot:repackage' } From 2b8a5f326cb5a08e9d94f82a67563b1126bb6d97 Mon Sep 17 00:00:00 2001 From: L_DelOff Date: Wed, 22 Nov 2023 11:32:44 +0300 Subject: [PATCH 75/75] =?UTF-8?q?=D1=83=D0=B1=D1=80=D0=B0=D0=BB=20=D0=BB?= =?UTF-8?q?=D0=B8=D1=88=D0=BD=D0=B8=D0=B5=20=D1=88=D0=B0=D0=B3=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Jenkinsfile_CI | 19 ------------------- 1 file changed, 19 deletions(-) diff --git a/Jenkinsfile_CI b/Jenkinsfile_CI index 35c497f..5cf3091 100644 --- a/Jenkinsfile_CI +++ b/Jenkinsfile_CI @@ -5,30 +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('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' } } - stage('Prune images') { - steps { - sh """ - 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