@@ -78,7 +78,7 @@ pipeline {
|
|||||||
steps {
|
steps {
|
||||||
script {
|
script {
|
||||||
def buildTime = sh(script: "TZ='Asia/Novosibirsk' date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
def buildTime = sh(script: "TZ='Asia/Novosibirsk' date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
||||||
def springProfile = params.SPRING_PROFILE
|
def baseUrl = params.SPRING_PROFILE == 'prod' ? 'https://workspace.not-copy.com' : 'https://dev-workspace.not-copy.com'
|
||||||
withCredentials([
|
withCredentials([
|
||||||
usernamePassword(
|
usernamePassword(
|
||||||
credentialsId: 'server-root-password',
|
credentialsId: 'server-root-password',
|
||||||
@@ -161,7 +161,7 @@ pipeline {
|
|||||||
-e POSTGRES_PORT=5432 \\
|
-e POSTGRES_PORT=5432 \\
|
||||||
-e POSTGRES_HOST=no_copy_${params.PORT} \\
|
-e POSTGRES_HOST=no_copy_${params.PORT} \\
|
||||||
-e FILE_STORAGE_PATH=/data/uploads \\
|
-e FILE_STORAGE_PATH=/data/uploads \\
|
||||||
-e SPRING_PROFILES_ACTIVE=${springProfile} \\
|
-e BASE_URL=${baseUrl} \\
|
||||||
app-backend-${params.PORT}:latest
|
app-backend-${params.PORT}:latest
|
||||||
|
|
||||||
echo '8. Проверка...'
|
echo '8. Проверка...'
|
||||||
|
|||||||
@@ -75,7 +75,7 @@ security:
|
|||||||
|
|
||||||
server:
|
server:
|
||||||
port: ${SERVER_PORT:8080}
|
port: ${SERVER_PORT:8080}
|
||||||
baseurl: ${BASE_URL:}
|
baseurl: ${BASE_URL}
|
||||||
front:
|
front:
|
||||||
port: ":2998"
|
port: ":2998"
|
||||||
tomcat:
|
tomcat:
|
||||||
@@ -146,27 +146,3 @@ tarif:
|
|||||||
enterprice-disk-size: 500
|
enterprice-disk-size: 500
|
||||||
enterprice-user-count: 80
|
enterprice-user-count: 80
|
||||||
|
|
||||||
---
|
|
||||||
spring:
|
|
||||||
config:
|
|
||||||
activate:
|
|
||||||
on-profile: dev
|
|
||||||
server:
|
|
||||||
baseurl: "https://dev-workspace.not-copy.com"
|
|
||||||
|
|
||||||
---
|
|
||||||
spring:
|
|
||||||
config:
|
|
||||||
activate:
|
|
||||||
on-profile: prod
|
|
||||||
server:
|
|
||||||
baseurl: "https://workspace.not-copy.com"
|
|
||||||
|
|
||||||
---
|
|
||||||
spring:
|
|
||||||
config:
|
|
||||||
activate:
|
|
||||||
on-profile: local
|
|
||||||
server:
|
|
||||||
baseurl: "http://localhost:8080"
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user