diff --git a/Jenkinsfile b/Jenkinsfile index 178fbcbcc..c4e87be4a 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -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}" diff --git a/docker-compose.yml b/docker-compose.yml index 0ab098249..33d8c2809 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,7 +8,7 @@ services: ports: - 4000 deploy: - replicas: 2 + replicas: ${FRONT_REPLICAS:?} placement: constraints: - node.role == worker \ No newline at end of file