Merge branch 'master' into test

Jenkinsfile

@@ -13,15 +13,6 @@ pipeline {
         stage('Checkout') {
             steps {
                 script {
-                    if (!env.GIT_COMMITTER_EMAIL) {
-                        env.COMMITTER_EMAIL = sh(
-                            script: 'git --no-pager show -s --format="%ae"',
-                            returnStdout: true
-                        ).trim()
-                    } else {
-                        env.COMMITTER_EMAIL = env.GIT_COMMITTER_EMAIL;
-                    }
-
                     switch (env.BRANCH_NAME) {
                         case 'master':
                             env.NODE_ENV = 'production'
@@ -41,7 +32,7 @@ pipeline {
                     load env.GROOVY_FILE
                 }
 
-                sh 'printenv'
+                setEnv()
             }
         }
         stage('Install') {
@@ -86,16 +77,14 @@ pipeline {
                 branch 'master'
             }}
             environment {
-                CREDS = credentials('docker-registry')
+                CREDENTIALS = credentials('docker-registry')
             }
             steps {
                 nodejs('node-v12') {
                     sh 'gulp build'
                 }
 
-                sh 'docker login --username $CREDS_USR --password $CREDS_PSW $REGISTRY'
+                dockerBuild()
-                sh 'docker-compose build --parallel'
-                sh 'docker-compose push'
             }
         }
         stage('Deploy') {
@@ -103,6 +92,9 @@ pipeline {
                 branch 'test'
                 branch 'master'
             }}
+            environment {
+                DOCKER_HOST = "${env.SWARM_HOST}"
+            }
             steps {
                 sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
             }

docker-compose.yml

@@ -9,6 +9,9 @@ services:
       - 80
     deploy:
       replicas: 2
+      placement:
+        constraints:
+          - node.role == worker
   back:
     image: registry.verdnatura.es/salix-back:${BRANCH_NAME:?}
     build: .
@@ -31,6 +34,9 @@ services:
       - /mnt/storage/image:/var/lib/salix/image
     deploy:
       replicas: ${BACK_REPLICAS:?}
+      placement:
+        constraints:
+          - node.role == worker
 configs:
   datasources:
     external: true