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

6695-docker_push_3 #1423

Merged
alexm merged 424 commits from 6695-docker_push_3 into dev 2025-02-21 12:41:37 +00:00
Conversation 0 Commits 424 Files Changed 40 +3 -3
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 4546f19432 - Show all commits

2
Jenkinsfile vendored
View File

@ -130,7 +130,7 @@ pipeline {
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'
sh 'docker-compose -f docker-compose.e2e.yml up -d front_e2e'
}
}
// stage('Build Cypress') {

4
docker-compose.e2e.yml
View File

@ -1,7 +1,7 @@
version: '3.7'
services:
front:
image: front
image: front_e2e
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
image: front_e2e
command: pnpx cypress run --browser chromium
build:
context: .