8714-devToTest #1547

Merged
alexm merged 712 commits from 8714-devToTest into test 2025-03-04 14:08:01 +00:00
3 changed files with 4 additions and 6 deletions
Showing only changes of commit 5b692612ae - Show all commits

2
Jenkinsfile vendored
View File

@ -124,7 +124,7 @@ pipeline {
}
stage('Run E2E') {
steps {
sh 'docker-compose -f docker-compose.e2e.yml up --build e2e'
sh 'docker-compose -f docker-compose.e2e.yml up e2e'
}
}
}

View File

@ -1,14 +1,12 @@
version: '3.7'
services:
front:
image: registry.verdnatura.es/salix-frontend:${VERSION:?}
command: quasar serve --history --proxy ./proxy.mjs --hostname 127.0.0.1 --port 9000
command: npx quasar dev
build:
context: .
dockerfile: ./Dockerfile
dockerfile: ./Dockerfile.e2e
network_mode: host
e2e:
image: registry.verdnatura.es/salix-frontend:${VERSION:?}
command: npx cypress run
build:
context: .

View File

@ -1,6 +1,6 @@
export default [
{
path: '/api',
rule: { target: 'http://0.0.0.0:3000' },
rule: { target: 'http://127.0.0.1:3000' },
},
];