8714-devToTest #1547

Merged
alexm merged 712 commits from 8714-devToTest into test 2025-03-04 14:08:01 +00:00
2 changed files with 9 additions and 7 deletions
Showing only changes of commit 73cd08ebc3 - Show all commits

2
Jenkinsfile vendored
View File

@ -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"
}

View File

@ -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