This commit is contained in:
@@ -85,6 +85,8 @@ pipeline {
|
||||
stage('Build on server') {
|
||||
steps {
|
||||
script {
|
||||
def BUILD_TIME_FRONT = sh(script: "date '+%d-%m-%Y %H:%M:%S'", returnStdout: true).trim()
|
||||
|
||||
withCredentials([
|
||||
usernamePassword(
|
||||
credentialsId: 'server-root-password',
|
||||
@@ -96,18 +98,15 @@ pipeline {
|
||||
sshpass -p '$SSH_PASS' ssh $SSH_USER@92.242.61.23 "
|
||||
cd /opt/deployments/frontend/${params.BRANCH}-${params.PORT}
|
||||
|
||||
echo '=== Редактируем docker-compose.yml ==='
|
||||
# 1. СОЗДАЕМ JSON ФАЙЛ (ЭТО РАБОТАЕТ 100%)
|
||||
mkdir -p public
|
||||
echo '{\\"buildTime\\": \\"${BUILD_TIME_FRONT}\\"}' > public/build-info.json
|
||||
|
||||
# Меняем имя контейнера
|
||||
# 2. Меняем имя контейнера и порт
|
||||
sed -i 's/container_name: no-copy-frontend\$/container_name: no-copy-frontend-${params.PORT}/' docker-compose.yml
|
||||
|
||||
# Меняем порт (2998 на нужный порт)
|
||||
sed -i 's/\\\"2998:2999\\\"/\\\"${params.PORT}:2999\\\"/' docker-compose.yml
|
||||
|
||||
echo 'Проверяем изменения:'
|
||||
grep -n 'container_name\\|ports' docker-compose.yml
|
||||
|
||||
echo '=== Строим образ ==='
|
||||
# 3. Собираем образ
|
||||
docker-compose -f docker-compose.yml -p frontend-${params.PORT} build
|
||||
"
|
||||
"""
|
||||
|
||||
@@ -19,12 +19,9 @@ public class HealtCheckController {
|
||||
@Value("${BUILD_TIME_BACK:unknown}")
|
||||
private String buildTimeBack;
|
||||
|
||||
@Value("${BUILD_TIME_FRONT:unknown}")
|
||||
private String buildTimeFront;
|
||||
|
||||
@GetMapping("/build")
|
||||
public BuildInfo getBuildInfo() {
|
||||
return new BuildInfo(buildTimeBack, buildTimeFront);
|
||||
return new BuildInfo(buildTimeBack);
|
||||
}
|
||||
|
||||
@GetMapping("/api/debug/memory")
|
||||
@@ -47,11 +44,9 @@ public class HealtCheckController {
|
||||
|
||||
static class BuildInfo {
|
||||
public String buildTimeBack;
|
||||
public String buildTimeFront;
|
||||
|
||||
public BuildInfo(String buildTimeBack, String buildTimeFront) {
|
||||
public BuildInfo(String buildTimeBack) {
|
||||
this.buildTimeBack = buildTimeBack;
|
||||
this.buildTimeFront = buildTimeFront;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user