From 15d3f7ee60d34d5273af57ec1045ea75b7adfe85 Mon Sep 17 00:00:00 2001
From: Juan Ferrer Toribio <juan@verdnatura.es>
Date: Tue, 10 Dec 2024 11:13:38 +0100
Subject: [PATCH] fix: refs #8285 Fix pipeline version

---
 Jenkinsfile | 28 ++++++++++------------------
 1 file changed, 10 insertions(+), 18 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 322a715e7..5422173f1 100644
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -102,8 +102,6 @@ pipeline {
                     def packageJson = readJSON file: 'package.json'
                     def version = "${packageJson.version}-build${env.BUILD_ID}"
                     writeFile(file: 'VERSION.txt', text: version)
-                    def readVersion = readFile(file: 'VERSION.txt').trim()
-                    echo "VERSION: ${readVersion}"
                 }
             }
         }
@@ -134,11 +132,10 @@ pipeline {
                             when {
                                 expression { RUN_BUILD }
                             }
+                            environment {
+                                VERSION = readFile 'VERSION.txt'
+                            }
                             steps {
-                                script {
-                                    def packageJson = readJSON file: 'package.json'
-                                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
-                                }
                                 sh 'docker-compose build back'
                             }
                         }
@@ -172,11 +169,10 @@ pipeline {
                             when {
                                 expression { RUN_BUILD }
                             }
+                            environment {
+                                VERSION = readFile 'VERSION.txt'
+                            }
                             steps {
-                                script {
-                                    def packageJson = readJSON file: 'package.json'
-                                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
-                                }
                                 sh 'gulp build'
                                 sh 'docker-compose build front'
                             }
@@ -191,12 +187,9 @@ pipeline {
             }
             environment {
                 CREDENTIALS = credentials('docker-registry')
+                VERSION = readFile 'VERSION.txt'
             }
             steps {
-                script {
-                    def packageJson = readJSON file: 'package.json'
-                    env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
-                }
                 sh 'docker login --username $CREDENTIALS_USR --password $CREDENTIALS_PSW $REGISTRY'
                 sh 'docker-compose push'
             }
@@ -223,11 +216,10 @@ pipeline {
                     when {
                         expression { FROM_GIT }
                     }
+                    environment {
+                        VERSION = readFile 'VERSION.txt'
+                    }
                     steps {
-                        script {
-                            def packageJson = readJSON file: 'package.json'
-                            env.VERSION = "${packageJson.version}-build${env.BUILD_ID}"
-                        }
                         withKubeConfig([
                             serverUrl: "$KUBERNETES_API",
                             credentialsId: 'kubernetes',