Merge to master #21

Merged
joan merged 163 commits from test into master 2022-10-20 11:59:30 +00:00
2 changed files with 8 additions and 8 deletions
Showing only changes of commit 6f38c7e4bb - Show all commits

14
Jenkinsfile vendored
View File

@ -13,13 +13,13 @@ pipeline {
steps {
script {
switch (env.BRANCH_NAME) {
// case 'master':
// env.NODE_ENV = 'production'
// env.BACK_REPLICAS = 1
// break
case 'master':
env.NODE_ENV = 'production'
env.FRONT_REPLICAS = 2
break
case 'test':
env.NODE_ENV = 'test'
env.BACK_REPLICAS = 1
env.FRONT_REPLICAS = 1
break
}
}
@ -58,7 +58,7 @@ pipeline {
stage('Build') {
when { anyOf {
branch 'test'
// branch 'master'
branch 'master'
}}
environment {
CREDENTIALS = credentials('docker-registry')
@ -73,7 +73,7 @@ pipeline {
stage('Deploy') {
when { anyOf {
branch 'test'
// branch 'master'
branch 'master'
}}
environment {
DOCKER_HOST = "${env.SWARM_HOST}"

View File

@ -8,7 +8,7 @@ services:
ports:
- 4000
deploy:
replicas: 2
replicas: ${FRONT_REPLICAS:?}
placement:
constraints:
- node.role == worker