ci: refs #6695 Docker & Jenkinsfile fixes/refactor
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
gitea/salix-front/pipeline/pr-dev There was a failure building this commit
Details
This commit is contained in:
parent
aa0ea0ef68
commit
1d05f9549a
|
@ -107,7 +107,6 @@ pipeline {
|
||||||
environment {
|
environment {
|
||||||
CREDENTIALS = credentials('docker-registry')
|
CREDENTIALS = credentials('docker-registry')
|
||||||
CI = 'true'
|
CI = 'true'
|
||||||
DOCKER = 'true'
|
|
||||||
TZ = 'Europe/Madrid'
|
TZ = 'Europe/Madrid'
|
||||||
COMPOSE_PROJECT = "${PROJECT_NAME}-${env.BRANCH_NAME}-${env.BUILD_ID}".toLowerCase()
|
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"
|
COMPOSE_PARAMS = "--project-name ${env.COMPOSE_PROJECT} --project-directory . --file test/cypress/docker-compose.yml"
|
||||||
|
@ -116,7 +115,7 @@ pipeline {
|
||||||
script {
|
script {
|
||||||
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
|
def image = docker.build('lilium-dev', '-f docs/Dockerfile.dev docs')
|
||||||
sh "docker-compose ${env.COMPOSE_PARAMS} up -d"
|
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'
|
sh 'cypress run --browser chromium --spec test/cypress/integration/claim/claimAction.spec.js'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -12,10 +12,8 @@ services:
|
||||||
command: pnpm exec quasar dev
|
command: pnpm exec quasar dev
|
||||||
volumes:
|
volumes:
|
||||||
- .:/app
|
- .:/app
|
||||||
working_dir: /app
|
|
||||||
environment:
|
environment:
|
||||||
- TZ
|
- CI=true
|
||||||
- CI
|
- TZ=Europe/Madrid
|
||||||
- DOCKER
|
|
||||||
db:
|
db:
|
||||||
image: registry.verdnatura.es/salix-db:25.10.0-build1343
|
image: registry.verdnatura.es/salix-db:25.10.0-build1343
|
||||||
|
|
Loading…
Reference in New Issue