From cf851c3cb200e09c05106da65e0dcfd326dd0e77 Mon Sep 17 00:00:00 2001 From: alexm Date: Mon, 10 Feb 2025 09:50:41 +0100 Subject: [PATCH] test: refs #6695 e2e fix connection db --- Jenkinsfile | 2 +- docker-compose.e2e.yml | 4 ++-- test/cypress/back/datasources.json | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 821c84c0c..6c874e104 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -128,7 +128,7 @@ pipeline { script { sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml up e2e" sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml logs back" - sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml logs db" + sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml logs vn-database" sh "docker-compose -p ${env.NETWORK} -f docker-compose.e2e.yml logs front" def containerId = sh(script: "docker-compose -f docker-compose.e2e.yml ps -q e2e", returnStdout: true).trim() if (containerId) { diff --git a/docker-compose.e2e.yml b/docker-compose.e2e.yml index 4ba461fcf..8371b01df 100644 --- a/docker-compose.e2e.yml +++ b/docker-compose.e2e.yml @@ -7,7 +7,7 @@ services: - ./test/cypress/storage:/salix/storage - ./test/cypress/back/datasources.json:/salix/loopback/server/datasources.json depends_on: - - db + - vn-database # ports: # - '3000:3000' front: @@ -25,7 +25,7 @@ services: volumes: - .:/app working_dir: /app - db: + vn-database: image: alexmorenovn/vn_db:latest # ports: # - '3306:3306' diff --git a/test/cypress/back/datasources.json b/test/cypress/back/datasources.json index fa7b81e1c..1fbacd099 100644 --- a/test/cypress/back/datasources.json +++ b/test/cypress/back/datasources.json @@ -7,7 +7,7 @@ "connector": "vn-mysql", "database": "vn", "debug": false, - "host": "db", + "host": "vn-database", "port": "3306", "username": "root", "password": "root",