diff --git a/Jenkinsfile b/Jenkinsfile index a0c868a7..c80b947f 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,6 +5,7 @@ pipeline { environment { DEVELOPMENT_COMPOSE_FILE = 'docker-compose.development.yml' + DEVELOPMENT_COMPOSE_PROJECT = 'admin-web' REGISTRY_HOST = '172.31.198.7:10082' REGISTRY_CREDENTIALS = 'gitea-registry-token' NODE_BASE_IMAGE = '172.31.198.7:10082/java-project/node:22-alpine' @@ -72,9 +73,9 @@ pipeline { --build-arg VITE_CLIENT_WEB_URL=http://8.163.49.32:9002 \ -t "$image" . export IMAGE_TAG="$SOURCE_TAG" - docker compose -f "$DEVELOPMENT_COMPOSE_FILE" up -d --remove-orphans --pull never - docker compose -f "$DEVELOPMENT_COMPOSE_FILE" ps - docker compose -f "$DEVELOPMENT_COMPOSE_FILE" exec -T admin-web wget -qO- http://127.0.0.1/healthz + docker compose -p "$DEVELOPMENT_COMPOSE_PROJECT" -f "$DEVELOPMENT_COMPOSE_FILE" up -d --remove-orphans --pull never + docker compose -p "$DEVELOPMENT_COMPOSE_PROJECT" -f "$DEVELOPMENT_COMPOSE_FILE" ps + docker compose -p "$DEVELOPMENT_COMPOSE_PROJECT" -f "$DEVELOPMENT_COMPOSE_FILE" exec -T admin-web wget -qO- http://127.0.0.1/healthz ''' } } diff --git a/src/deployment/nginxConfig.test.ts b/src/deployment/nginxConfig.test.ts index 079261f5..1c389c18 100644 --- a/src/deployment/nginxConfig.test.ts +++ b/src/deployment/nginxConfig.test.ts @@ -42,7 +42,8 @@ describe('admin nginx deployment config', () => { it('runs each deployment on its target node without controller-local SSH files', () => { expect(jenkinsfile).toContain("env.JOB_BASE_NAME?.endsWith('-dev') ? 'java-dev' : 'java-test'") - expect(jenkinsfile).toContain('docker compose -f "$DEVELOPMENT_COMPOSE_FILE" up -d') + expect(jenkinsfile).toContain("DEVELOPMENT_COMPOSE_PROJECT = 'admin-web'") + expect(jenkinsfile).toContain('docker compose -p "$DEVELOPMENT_COMPOSE_PROJECT" -f "$DEVELOPMENT_COMPOSE_FILE" up -d') expect(jenkinsfile).not.toContain('/var/jenkins_home/.ssh') expect(jenkinsfile).not.toContain('docker save') expect(jenkinsfile).not.toMatch(/\bssh\b/)