Merge branch 'master' into test
gitea/salix/pipeline/head This commit looks good Details

This commit is contained in:
Juan Ferrer 2020-11-30 19:05:44 +01:00
commit fc9412bddd
2 changed files with 4 additions and 2 deletions

2
Jenkinsfile vendored
View File

@ -25,9 +25,11 @@ pipeline {
switch (env.BRANCH_NAME) { switch (env.BRANCH_NAME) {
case 'master': case 'master':
env.NODE_ENV = 'production' env.NODE_ENV = 'production'
env.BACK_REPLICAS = 4
break break
case 'test': case 'test':
env.NODE_ENV = 'test' env.NODE_ENV = 'test'
env.BACK_REPLICAS = 2
break break
} }
} }

View File

@ -8,7 +8,7 @@ services:
ports: ports:
- 80 - 80
deploy: deploy:
replicas: 3 replicas: 2
back: back:
image: registry.verdnatura.es/salix-back:${BRANCH_NAME:?} image: registry.verdnatura.es/salix-back:${BRANCH_NAME:?}
build: . build: .
@ -30,7 +30,7 @@ services:
- /mnt/storage/dms:/var/lib/salix/dms - /mnt/storage/dms:/var/lib/salix/dms
- /mnt/storage/image:/var/lib/salix/image - /mnt/storage/image:/var/lib/salix/image
deploy: deploy:
replicas: 6 replicas: ${BACK_REPLICAS:?}
configs: configs:
datasources: datasources:
external: true external: true