test: refs #6695 e2e fix connection db
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
This commit is contained in:
parent
73cd08ebc3
commit
cf851c3cb2
|
@ -128,7 +128,7 @@ pipeline {
|
||||||
script {
|
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 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 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"
|
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()
|
def containerId = sh(script: "docker-compose -f docker-compose.e2e.yml ps -q e2e", returnStdout: true).trim()
|
||||||
if (containerId) {
|
if (containerId) {
|
||||||
|
|
|
@ -7,7 +7,7 @@ services:
|
||||||
- ./test/cypress/storage:/salix/storage
|
- ./test/cypress/storage:/salix/storage
|
||||||
- ./test/cypress/back/datasources.json:/salix/loopback/server/datasources.json
|
- ./test/cypress/back/datasources.json:/salix/loopback/server/datasources.json
|
||||||
depends_on:
|
depends_on:
|
||||||
- db
|
- vn-database
|
||||||
# ports:
|
# ports:
|
||||||
# - '3000:3000'
|
# - '3000:3000'
|
||||||
front:
|
front:
|
||||||
|
@ -25,7 +25,7 @@ services:
|
||||||
volumes:
|
volumes:
|
||||||
- .:/app
|
- .:/app
|
||||||
working_dir: /app
|
working_dir: /app
|
||||||
db:
|
vn-database:
|
||||||
image: alexmorenovn/vn_db:latest
|
image: alexmorenovn/vn_db:latest
|
||||||
# ports:
|
# ports:
|
||||||
# - '3306:3306'
|
# - '3306:3306'
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
"connector": "vn-mysql",
|
"connector": "vn-mysql",
|
||||||
"database": "vn",
|
"database": "vn",
|
||||||
"debug": false,
|
"debug": false,
|
||||||
"host": "db",
|
"host": "vn-database",
|
||||||
"port": "3306",
|
"port": "3306",
|
||||||
"username": "root",
|
"username": "root",
|
||||||
"password": "root",
|
"password": "root",
|
||||||
|
|
Loading…
Reference in New Issue