diff --git a/Jenkinsfile b/Jenkinsfile index 73e344dcd..2b48eb26d 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -107,7 +107,6 @@ pipeline { environment { CREDENTIALS = credentials('docker-registry') CI = 'true' - DOCKER = 'true' TZ = 'Europe/Madrid' COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BRANCH_NAME}-${env.BUILD_ID}".toLowerCase() COMPOSE_PARAMS = "--project-name ${env.COMPOSE_PROJECT} --project-directory . --file test/cypress/docker-compose.yml" @@ -116,7 +115,7 @@ pipeline { script { def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs') sh "docker-compose ${env.COMPOSE_PARAMS} up -d" - image.inside("--network ${env.COMPOSE_PROJECT}_default -e TZ -e CI -e DOCKER") { + image.inside("--network ${env.COMPOSE_PROJECT}_default -e TZ -e CI") { sh 'cypress run --browser chromium --spec test/cypress/integration/claim/claimAction.spec.js' } } diff --git a/test/cypress/docker-compose.yml b/test/cypress/docker-compose.yml index 49883e538..d53eaa1fb 100644 --- a/test/cypress/docker-compose.yml +++ b/test/cypress/docker-compose.yml @@ -12,10 +12,8 @@ services: command: pnpm exec quasar dev volumes: - .:/app - working_dir: /app environment: - - TZ - - CI - - DOCKER + - CI=true + - TZ=Europe/Madrid db: image: registry.verdnatura.es/salix-db:25.10.0-build1343