diff --git a/Jenkinsfile b/Jenkinsfile index b24a1adef..d4668b637 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -92,6 +92,10 @@ pipeline { IMAGE = "$REGISTRY/salix-back" } steps { + script { + def packageJson = readJSON file: 'package.json' + env.VERSION = "${packageJson.version}-e2e${env.BUILD_ID}" + } // // sh 'docker pull $IMAGE:dev' // sh 'git clone https://gitea.verdnatura.es/verdnatura/salix.git' // // sh 'docker ps -a' @@ -104,9 +108,9 @@ pipeline { // sh 'cd front' // sh '# export VERSION=e2e-try' sh 'docker build -f salix/back/Dockerfile -t back ./salix' - sh 'docker-compose -f docker-compose.e2e.yml up db' + sh 'docker-compose -f docker-compose.e2e.yml up db -d' sh 'docker run --net=host -v ./test/cypress/storage:/salix/storage -d back' - sh 'docker-compose -f docker-compose.e2e.yml -d up front' + sh 'docker-compose -f docker-compose.e2e.yml -d up front -d' sh 'docker-compose -f docker-compose.e2e.yml up e2e --build' }