Jenkinsfile

@@ -2,54 +2,64 @@
 
 pipeline {
     agent any
+    options {
+        disableConcurrentBuilds()
+    }
     environment {
         PROJECT_NAME = 'vn-rfid'
+        STACK_NAME   = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
     }
     stages {
-        stage('Setup') {
+        stage('Checkout') {
             steps {
-                echo "NODE_NAME: ${env.NODE_NAME}"
-                echo "WORKSPACE: ${env.WORKSPACE}"
+                script {
+                    switch (env.BRANCH_NAME) {
+                        case 'master':
+                            env.NODE_ENV = 'production'
+                            break
+                    }
+                }
+
+                setEnv()
             }
         }
         stage('Build') {
-            when {
+            when { anyOf {
                 branch 'master'
-            }
+            }}
             environment {
                 CREDENTIALS = credentials('docker-registry')
             }
             steps {
-                script {
-                    def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
-                }
                 dockerBuild()
             }
         }
         stage('Deploy') {
-            when {
+            when { anyOf {
                 branch 'master'
+            }}
+            environment {
+                DOCKER_HOST = "${env.SWARM_HOST}"
             }
             steps {
-                script {
-                    def packageJson = readJSON file: 'package.json'
-                    env.VERSION = packageJson.version
-                }
-                withKubeConfig([
-                    serverUrl: "$KUBERNETES_API",
-                    credentialsId: 'kubernetes',
-                    namespace: 'vn-rfid'
-                ]) {
-                    sh 'kubectl set image deployment/vn-rfid vn-rfid=$REGISTRY/vn-rfid:$VERSION'
-                }
+                sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
             }
         }
     }
     post {
         always {
-            setEnv()
-            sendEmail()
+            script {
+                if (!env.COMMITTER_EMAIL || currentBuild.currentResult == 'SUCCESS') return;
+                try {
+                    mail(
+                        to: env.COMMITTER_EMAIL,
+                        subject: "Pipeline: ${env.JOB_NAME} (${env.BUILD_NUMBER}): ${currentBuild.currentResult}",
+                        body: "Check status at ${env.BUILD_URL}"
+                    )
+                } catch (e) {
+                    echo e.toString()
+                }
+            }
         }
     }
 }

docker-compose.yml

@@ -1,7 +1,20 @@
 version: '3.7'
 services:
   main:
-    image: registry.verdnatura.es/vn-rfid:${VERSION:?}
+    image: registry.verdnatura.es/vn-rfid:${BRANCH_NAME:?}
     build:
       context: .
       dockerfile: Dockerfile
+    ports:
+      - 8888
+    configs:
+      - source: config
+        target: /app/config.local.yml
+    deploy:
+      placement:
+        constraints:
+          - node.role == worker
+configs:
+  config:
+    external: true
+    name: vn-rfid_config

src/newPallet.js

@@ -1,10 +1,12 @@
 import con from '../db/connect.js';
+import counter from './counter.js';
 import t from '../util/translator.js';
 
 export default async(rfids, arcId) => {
     try {
         console.log(Array.from(rfids));
         await con.query(`CALL vn.expeditionPallet_build(JSON_ARRAY(?), ?, ?, @palletId);`, [Array.from(rfids), arcId, null]);
+        await counter(null, arcId);
     } catch (error) {
         console.log(error);
         await con.query(`UPDATE vn.arcRead SET error = ?, counter = NULL WHERE id = ?;`, [t(error.sqlMessage), arcId]);

src/stream.js

@@ -43,7 +43,6 @@ export default async(conf, cb) => {
             newPallet(rfidbuffer, conf.arcId);
         rfidbuffer = new Set();
         rfidbufferExtend = [];
-        counterIntervalManager();
     }
 
     function counterIntervalManager() {