diff --git a/Jenkinsfile b/Jenkinsfile index 87079a4db..4e04be1ce 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -120,8 +120,8 @@ pipeline { } stage('Frontend') { steps { - // sh 'quasar build' // Use quasar prod version - sh 'docker-compose -f docker-compose.e2e.yml build' + sh 'docker build -f docker-compose.e2e.yml -t front' + // sh 'docker-compose -f docker-compose.e2e.yml build' sh 'docker-compose -f docker-compose.e2e.yml up -d front' } } diff --git a/docker-compose.e2e.yml b/docker-compose.e2e.yml index 466e73e78..b2d0fddfe 100644 --- a/docker-compose.e2e.yml +++ b/docker-compose.e2e.yml @@ -1,6 +1,7 @@ version: '3.7' services: front: + image: front command: npx quasar dev # command: npx quasar serve --history --proxy ./proxy.mjs --hostname 127.0.0.1 --port 9000 build: @@ -10,7 +11,8 @@ services: volumes: - ./node_modules:/app/node_modules e2e: - command: npx cypress run --browser chromium + image: front + command: pnpx cypress run --browser chromium build: context: . dockerfile: ./Dockerfile.e2e