Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev This commit looks good Details

This commit is contained in:
Joan Sanchez 2019-12-19 15:04:45 +01:00
commit 688b68a18a
2 changed files with 3 additions and 8 deletions

9
Jenkinsfile vendored
View File

@ -107,13 +107,8 @@ pipeline {
branch 'test'
branch 'master'
}}
environment {
DOCKER_TLS_VERIFY = 1
}
parallel {
steps {
sh "docker stack deploy --compose-file docker-compose.yml ${env.STACK_NAME}"
}
steps {
sh "docker stack deploy --compose-file docker-compose.yml ${env.STACK_NAME}"
}
}
stage('Database') {

View File

@ -21,7 +21,7 @@ services:
environment:
- NODE_ENV
volumes:
- /containers/salix:/etc/salix
- /mnt/storage/containers/salix:/etc/salix
- /mnt/storage/pdfs:/var/lib/salix/pdfs
- /mnt/storage/dms:/var/lib/salix/dms
deploy: