html/client-web
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix(ci): preserve client compose project identity

Browse Source
This commit is contained in:
ouyangxq
2026-08-24 14:44:38 +08:00
parent 78a2f7da96
commit 86e6c81fc7
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Jenkinsfile
Vendored
+4 -3
View File
@@ -5,6 +5,7 @@ pipeline {
environment { environment {
DEVELOPMENT_COMPOSE_FILE = 'docker-compose.development.yml' DEVELOPMENT_COMPOSE_FILE = 'docker-compose.development.yml'
DEVELOPMENT_COMPOSE_PROJECT = 'client-web'
REGISTRY_HOST = '172.31.198.7:10082' REGISTRY_HOST = '172.31.198.7:10082'
REGISTRY_CREDENTIALS = 'gitea-registry-token' REGISTRY_CREDENTIALS = 'gitea-registry-token'
NODE_BASE_IMAGE = '172.31.198.7:10082/java-project/node:22-alpine' NODE_BASE_IMAGE = '172.31.198.7:10082/java-project/node:22-alpine'
@@ -72,9 +73,9 @@ pipeline {
--build-arg VITE_ADMIN_WEB_ORIGIN=http://8.163.49.32:9001 \ --build-arg VITE_ADMIN_WEB_ORIGIN=http://8.163.49.32:9001 \
-t "$image" . -t "$image" .
export IMAGE_TAG="$SOURCE_TAG" export IMAGE_TAG="$SOURCE_TAG"
docker compose -f "$DEVELOPMENT_COMPOSE_FILE" up -d --remove-orphans --pull never docker compose -p "$DEVELOPMENT_COMPOSE_PROJECT" -f "$DEVELOPMENT_COMPOSE_FILE" up -d --remove-orphans --pull never
docker compose -f "$DEVELOPMENT_COMPOSE_FILE" ps docker compose -p "$DEVELOPMENT_COMPOSE_PROJECT" -f "$DEVELOPMENT_COMPOSE_FILE" ps
docker compose -f "$DEVELOPMENT_COMPOSE_FILE" exec -T client-web wget -qO- http://127.0.0.1/healthz docker compose -p "$DEVELOPMENT_COMPOSE_PROJECT" -f "$DEVELOPMENT_COMPOSE_FILE" exec -T client-web wget -qO- http://127.0.0.1/healthz
''' '''
} }
} }
src/deployment/nginxConfig.test.mjs
+2 -1
View File
@@ -12,7 +12,8 @@ test('allows qualification uploads with multipart overhead through the API proxy
test('runs each deployment on its target node without controller-local SSH files', () => { test('runs each deployment on its target node without controller-local SSH files', () => {
assert.match(jenkinsfile, /env\.JOB_BASE_NAME\?\.endsWith\('-dev'\) \? 'java-dev' : 'java-test'/) assert.match(jenkinsfile, /env\.JOB_BASE_NAME\?\.endsWith\('-dev'\) \? 'java-dev' : 'java-test'/)
assert.match(jenkinsfile, /docker compose -f "\$DEVELOPMENT_COMPOSE_FILE" up -d/) assert.match(jenkinsfile, /DEVELOPMENT_COMPOSE_PROJECT = 'client-web'/)
assert.match(jenkinsfile, /docker compose -p "\$DEVELOPMENT_COMPOSE_PROJECT" -f "\$DEVELOPMENT_COMPOSE_FILE" up -d/)
assert.doesNotMatch(jenkinsfile, /\/var\/jenkins_home\/\.ssh|docker save|\bssh\b/) assert.doesNotMatch(jenkinsfile, /\/var\/jenkins_home\/\.ssh|docker save|\bssh\b/)
}) })