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
2 changed files with 4 additions and 3 deletions
Showing only changes of commit 0e4c4a33de - Show all commits

3
Jenkinsfile vendored
View File

@ -121,7 +121,8 @@ pipeline {
stage('Frontend') {
steps {
// sh 'quasar build' // Use quasar prod version
sh 'docker-compose -f docker-compose.e2e.yml up -d --build front'
sh 'docker-compose -f docker-compose.e2e.yml build'
sh 'docker-compose -f docker-compose.e2e.yml up -d front'
}
}
// stage('Build Cypress') {

View File

@ -1,8 +1,8 @@
version: '3.7'
services:
front:
# command: npx quasar dev
command: npx quasar serve --history --proxy ./proxy.mjs --hostname 127.0.0.1 --port 9000
command: npx quasar dev
# command: npx quasar serve --history --proxy ./proxy.mjs --hostname 127.0.0.1 --port 9000
build:
context: .
dockerfile: ./Dockerfile.e2e