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 3 additions and 3 deletions
Showing only changes of commit 3dfce751dc - Show all commits

2
Jenkinsfile vendored
View File

@ -107,7 +107,7 @@ pipeline {
environment {
CREDENTIALS = credentials('docker-registry')
COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}"
COMPOSE_PARAMS = "--project-name ${env.COMPOSE_PROJECT} --project-directory . --file test/cypress/docker-compose.yml"
COMPOSE_PARAMS = "-p ${env.COMPOSE_PROJECT} -f test/cypress/docker-compose.yml --project-directory ."
TZ = 'Europe/Madrid'
CI = 'true'
}

View File

@ -7,6 +7,7 @@ services:
- ./test/cypress/back/datasources.json:/salix/loopback/server/datasources.json
depends_on:
- db
dns_search: .
front:
image: lilium-dev:latest
command: pnpm exec quasar dev
@ -15,7 +16,6 @@ services:
environment:
- CI
- TZ
dns_search: .
db:
image: registry.verdnatura.es/salix-db:dev
networks:
default: