feature/task-30-docker #31

Merged
L_DelOff merged 76 commits from feature/task-30-docker into master 2023-11-22 11:36:41 +03:00
4 changed files with 13 additions and 12 deletions
Showing only changes of commit a20b0c4963 - Show all commits

View File

@@ -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') {

View File

@@ -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'
}
}
}

View File

@@ -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:

View File

@@ -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