From a20b0c4963c6980712188ed7bcdc784ff7c7eaea Mon Sep 17 00:00:00 2001
From: L_DelOff <l_deloff@ldeloff.ru>
Date: Mon, 20 Nov 2023 22:07:30 +0300
Subject: [PATCH] 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