verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity

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
parent 42239815e0 592b672493
commit 688b68a18a
2 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Jenkinsfile vendored
View File

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

2
docker-compose.yml
View File

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