verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 98 Releases Wiki Activity

ci: refs #6695 Docker & Jenkinsfile fixes/refactor
gitea/salix-front/pipeline/pr-dev There was a failure building this commit Details

This commit is contained in:
Juan Ferrer 2025-02-21 11:29:34 +01:00
parent a45e632e31
commit 3dfce751dc
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Jenkinsfile vendored
View File

@ -107,7 +107,7 @@ pipeline {
environment { environment {
CREDENTIALS = credentials('docker-registry') CREDENTIALS = credentials('docker-registry')
COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BUILD_ID}" 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' TZ = 'Europe/Madrid'
CI = 'true' CI = 'true'
} }

4
test/cypress/docker-compose.yml
View File

@ -7,6 +7,7 @@ services:
- ./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 - db
dns_search: .
front: front:
image: lilium-dev:latest image: lilium-dev:latest
command: pnpm exec quasar dev command: pnpm exec quasar dev
@ -15,7 +16,6 @@ services:
environment: environment:
- CI - CI
- TZ - TZ
dns_search: .
db: db:
image: registry.verdnatura.es/salix-db:dev image: registry.verdnatura.es/salix-db:dev
networks:
default: