From 73cd08ebc372f5a710d82cd49d9d16d155fc81c7 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 10 Feb 2025 09:31:13 +0100 Subject: [PATCH] test: refs #6695 e2e fix connection db --- Jenkinsfile | 2 +- docker-compose.e2e.yml | 14 ++++++++------ 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index f1323bdb51..821c84c0c6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -118,7 +118,7 @@ pipeline { } stage('Up') { steps { - sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d db" + // sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d db" sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d back" sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up -d front" } diff --git a/docker-compose.e2e.yml b/docker-compose.e2e.yml index 8e0ef6a57f..4ba461fcfe 100644 --- a/docker-compose.e2e.yml +++ b/docker-compose.e2e.yml @@ -6,16 +6,18 @@ services: volumes: - ./test/cypress/storage:/salix/storage - ./test/cypress/back/datasources.json:/salix/loopback/server/datasources.json - ports: - - '3000:3000' + depends_on: + - db + # ports: + # - '3000:3000' front: image: alexmorenovn/vndev:latest command: quasar dev volumes: - .:/app working_dir: /app - ports: - - '9000:9000' + # ports: + # - '9000:9000' e2e: image: alexmorenovn/vndev:latest # command: pnpm exec cypress run --browser chromium @@ -25,8 +27,8 @@ services: working_dir: /app db: image: alexmorenovn/vn_db:latest - ports: - - '3306:3306' + # ports: + # - '3306:3306' # e2e: # command: npx cypress run --browser chromium