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

4
Jenkinsfile vendored
View File

@ -129,8 +129,8 @@ pipeline {
stage('Frontend') {
steps {
// sh 'docker build -f Dockerfile.e2e -t front .'
sh 'docker-compose -f docker-compose.e2e.yml build'
sh 'docker-compose -f docker-compose.e2e.yml up -d front_e2e'
sh 'docker-compose -f docker-compose.e2e.yml build front'
sh 'docker-compose -f docker-compose.e2e.yml up -d front'
}
}
// stage('Build Cypress') {

View File

@ -1,7 +1,7 @@
version: '3.7'
services:
front:
image: front_e2e
image: front
command: npx quasar dev
# command: npx quasar serve --history --proxy ./proxy.mjs --hostname 127.0.0.1 --port 9000
build:
@ -11,7 +11,7 @@ services:
volumes:
- ./node_modules:/app/node_modules
e2e:
image: front_e2e
image: front
command: pnpx cypress run --browser chromium
build:
context: .