Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/vn-rfid

Reviewed-on: #5

Jenkinsfile

@@ -2,64 +2,54 @@
 
 pipeline {
     agent any
-    options {
-        disableConcurrentBuilds()
-    }
     environment {
         PROJECT_NAME = 'vn-rfid'
-        STACK_NAME   = "${env.PROJECT_NAME}-${env.BRANCH_NAME}"
     }
     stages {
-        stage('Checkout') {
+        stage('Setup') {
             steps {
-                script {
+                echo "NODE_NAME: ${env.NODE_NAME}"
-                    switch (env.BRANCH_NAME) {
+                echo "WORKSPACE: ${env.WORKSPACE}"
-                        case 'master':
-                            env.NODE_ENV = 'production'
-                            break
-                    }
-                }
-
-                setEnv()
             }
         }
         stage('Build') {
-            when { anyOf {
+            when {
                 branch 'master'
-            }}
+            }
             environment {
                 CREDENTIALS = credentials('docker-registry')
             }
             steps {
+                script {
+                    def packageJson = readJSON file: 'package.json'
+                    env.VERSION = packageJson.version
+                }
                 dockerBuild()
             }
         }
         stage('Deploy') {
-            when { anyOf {
+            when {
                 branch 'master'
-            }}
-            environment {
-                DOCKER_HOST = "${env.SWARM_HOST}"
             }
             steps {
-                sh "docker stack deploy --with-registry-auth --compose-file docker-compose.yml ${env.STACK_NAME}"
+                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'
+                }
             }
         }
     }
     post {
         always {
-            script {
+            setEnv()
-                if (!env.COMMITTER_EMAIL || currentBuild.currentResult == 'SUCCESS') return;
+            sendEmail()
-                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,20 +1,7 @@
 version: '3.7'
 services:
   main:
-    image: registry.verdnatura.es/vn-rfid:${BRANCH_NAME:?}
+    image: registry.verdnatura.es/vn-rfid:${VERSION:?}
     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,12 +1,10 @@
 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,6 +43,7 @@ export default async(conf, cb) => {
             newPallet(rfidbuffer, conf.arcId);
         rfidbuffer = new Set();
         rfidbufferExtend = [];
+        counterIntervalManager();
     }
 
     function counterIntervalManager() {