From 6b2cb0f71a44841515c7fb671005a891fe31f29d Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Wed, 11 Oct 2023 16:46:17 +0200
Subject: [PATCH 01/15] Test docker plugin

---
 Jenkinsfile | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 38aad3f3..41db9e35 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -182,12 +182,6 @@ pipeline {
       }
     }
 
-    stage('Docker login'){
-      steps{
-        sh 'cat "$GCR_KEY" | docker login -u _json_key --password-stdin https://gcr.io'
-      }
-    }
-
     stage('Dev Docker Images') {
       options {
          timeout(time: params.BUILD_TIME_OUT, unit: 'MINUTES')
@@ -608,9 +602,7 @@ def generateBuildStage(server) {
       def version = getVersion(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
         sh """
             lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run docker:${env.BUILD_COMMAND};
-            docker tag ${name}:${version} ${REPOSITORY_SERVER}/${name}:${version}
-            docker push ${REPOSITORY_SERVER}/${name}:${version}
-            docker rmi ${REPOSITORY_SERVER}/${name}:${version}
+            def Image = docker.build(${REPOSITORY_SERVER}/${name}:${version}, "-f Dockerfile .")
         """
       } catch (e) {
         slackSend (color: '#FF0000', message: "FAILED:  Job  '${env.JOB_NAME}'  BUILD NUMBER:  '${env.BUILD_NUMBER}'  Job failed in stage docker-build ${server}. click <${env.RUN_DISPLAY_URL}|here> to see the log. Error: ${e}", channel: 'idestack-automation')

From b5c2fe742ea5abbdb5ba5942f681dae54b663492 Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Wed, 11 Oct 2023 20:23:17 +0200
Subject: [PATCH 02/15] Update docker build

---
 Jenkinsfile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 41db9e35..f75edafc 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -182,6 +182,12 @@ pipeline {
       }
     }
 
+    stage('Docker login'){
+      steps{
+        sh 'cat "$GCR_KEY" | docker login -u _json_key --password-stdin https://gcr.io'
+      }
+    }
+
     stage('Dev Docker Images') {
       options {
          timeout(time: params.BUILD_TIME_OUT, unit: 'MINUTES')
@@ -601,8 +607,8 @@ def generateBuildStage(server) {
       def name = getName(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
       def version = getVersion(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
         sh """
-            lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run docker:${env.BUILD_COMMAND};
-            def Image = docker.build(${REPOSITORY_SERVER}/${name}:${version}, "-f Dockerfile .")
+            lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build
+            def newImage = docker.build("${REPOSITORY_SERVER}/${name}:${version}", "-f Dockerfile .")
         """
       } catch (e) {
         slackSend (color: '#FF0000', message: "FAILED:  Job  '${env.JOB_NAME}'  BUILD NUMBER:  '${env.BUILD_NUMBER}'  Job failed in stage docker-build ${server}. click <${env.RUN_DISPLAY_URL}|here> to see the log. Error: ${e}", channel: 'idestack-automation')

From 5d01675622a24be63c75e0f3a1fcfc7872a72e7f Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Thu, 12 Oct 2023 13:05:04 +0200
Subject: [PATCH 03/15] test

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f75edafc..d990a509 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -607,7 +607,7 @@ def generateBuildStage(server) {
       def name = getName(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
       def version = getVersion(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
         sh """
-            lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build
+            lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;
             def newImage = docker.build("${REPOSITORY_SERVER}/${name}:${version}", "-f Dockerfile .")
         """
       } catch (e) {

From 251b551ff513df4cf21d145f57a9bb0abb47b056 Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Thu, 12 Oct 2023 21:30:22 +0200
Subject: [PATCH 04/15] test

---
 Jenkinsfile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index d990a509..b21d4099 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -608,7 +608,8 @@ def generateBuildStage(server) {
       def version = getVersion(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
         sh """
             lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;
-            def newImage = docker.build("${REPOSITORY_SERVER}/${name}:${version}", "-f Dockerfile .")
+            def imageTag = "${REPOSITORY_SERVER}/${name}:${version}"
+            docker.build(${imageTag}, "-f Dockerfile .")
         """
       } catch (e) {
         slackSend (color: '#FF0000', message: "FAILED:  Job  '${env.JOB_NAME}'  BUILD NUMBER:  '${env.BUILD_NUMBER}'  Job failed in stage docker-build ${server}. click <${env.RUN_DISPLAY_URL}|here> to see the log. Error: ${e}", channel: 'idestack-automation')

From 345a0c4acd0fe8fc61b7c79bca3e8e9bd5d6624a Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Thu, 12 Oct 2023 23:28:50 +0200
Subject: [PATCH 05/15] test

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index b21d4099..10bb5284 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -606,10 +606,10 @@ def generateBuildStage(server) {
       echo "This is ${server}."
       def name = getName(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
       def version = getVersion(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
+      def imageTag = "${REPOSITORY_SERVER}/${name}:${version}"
         sh """
             lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;
-            def imageTag = "${REPOSITORY_SERVER}/${name}:${version}"
-            docker.build(${imageTag}, "-f Dockerfile .")
+            docker.build("${imageTag}", "-f Dockerfile .")
         """
       } catch (e) {
         slackSend (color: '#FF0000', message: "FAILED:  Job  '${env.JOB_NAME}'  BUILD NUMBER:  '${env.BUILD_NUMBER}'  Job failed in stage docker-build ${server}. click <${env.RUN_DISPLAY_URL}|here> to see the log. Error: ${e}", channel: 'idestack-automation')

From 374cd80bf1fd0847230b2a1e25a7f31d3960ab6e Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Thu, 12 Oct 2023 23:59:01 +0200
Subject: [PATCH 06/15] test

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 10bb5284..083f0b64 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -609,7 +609,7 @@ def generateBuildStage(server) {
       def imageTag = "${REPOSITORY_SERVER}/${name}:${version}"
         sh """
             lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;
-            docker.build("${imageTag}", "-f Dockerfile .")
+            docker.build(test:123, "-f Dockerfile .")
         """
       } catch (e) {
         slackSend (color: '#FF0000', message: "FAILED:  Job  '${env.JOB_NAME}'  BUILD NUMBER:  '${env.BUILD_NUMBER}'  Job failed in stage docker-build ${server}. click <${env.RUN_DISPLAY_URL}|here> to see the log. Error: ${e}", channel: 'idestack-automation')

From c1ea16de5310395f945ae806df4b9cd96ac4cf6a Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Fri, 13 Oct 2023 09:57:37 +0200
Subject: [PATCH 07/15] test

---
 Jenkinsfile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 083f0b64..f5f84959 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -607,10 +607,8 @@ def generateBuildStage(server) {
       def name = getName(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
       def version = getVersion(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
       def imageTag = "${REPOSITORY_SERVER}/${name}:${version}"
-        sh """
-            lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;
-            docker.build(test:123, "-f Dockerfile .")
-        """
+      sh "lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;"
+      def newImage = docker.build("test:123", "-f Dockerfile .")
       } catch (e) {
         slackSend (color: '#FF0000', message: "FAILED:  Job  '${env.JOB_NAME}'  BUILD NUMBER:  '${env.BUILD_NUMBER}'  Job failed in stage docker-build ${server}. click <${env.RUN_DISPLAY_URL}|here> to see the log. Error: ${e}", channel: 'idestack-automation')
         throw(e)

From a1395e4bb2827f460b556ef0f6a5d5f50cdfc168 Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Fri, 13 Oct 2023 12:57:42 +0200
Subject: [PATCH 08/15] test

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f5f84959..bdeae278 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -608,7 +608,7 @@ def generateBuildStage(server) {
       def version = getVersion(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
       def imageTag = "${REPOSITORY_SERVER}/${name}:${version}"
       sh "lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;"
-      def newImage = docker.build("test:123", "-f Dockerfile .")
+      def newImage = docker.build("$imageTag", "-f Dockerfile servers/$server")
       } catch (e) {
         slackSend (color: '#FF0000', message: "FAILED:  Job  '${env.JOB_NAME}'  BUILD NUMBER:  '${env.BUILD_NUMBER}'  Job failed in stage docker-build ${server}. click <${env.RUN_DISPLAY_URL}|here> to see the log. Error: ${e}", channel: 'idestack-automation')
         throw(e)

From 37e657ad43b41df4d557827e8c5bfa0257f3f825 Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Sun, 15 Oct 2023 11:02:23 +0300
Subject: [PATCH 09/15] test

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index bdeae278..de162043 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -608,7 +608,7 @@ def generateBuildStage(server) {
       def version = getVersion(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
       def imageTag = "${REPOSITORY_SERVER}/${name}:${version}"
       sh "lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;"
-      def newImage = docker.build("$imageTag", "-f Dockerfile servers/$server")
+      def newImage = docker.build("$imageTag", "-f servers/$server/Dockerfile .")
       } catch (e) {
         slackSend (color: '#FF0000', message: "FAILED:  Job  '${env.JOB_NAME}'  BUILD NUMBER:  '${env.BUILD_NUMBER}'  Job failed in stage docker-build ${server}. click <${env.RUN_DISPLAY_URL}|here> to see the log. Error: ${e}", channel: 'idestack-automation')
         throw(e)

From 9ef58dc4661223eadec7b85f32256a6e2e218429 Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Tue, 17 Oct 2023 20:51:01 +0200
Subject: [PATCH 10/15] test

---
 Jenkinsfile | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index de162043..803a663a 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -608,7 +608,10 @@ def generateBuildStage(server) {
       def version = getVersion(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
       def imageTag = "${REPOSITORY_SERVER}/${name}:${version}"
       sh "lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;"
-      def newImage = docker.build("$imageTag", "-f servers/$server/Dockerfile .")
+      docker.withRegistry('https://gcr.io', 'jenkins-gcr-login-key') {
+        def newImage = docker.build("$imageTag", "-f servers/$server/Dockerfile .")
+        newImage.push()
+      }
       } catch (e) {
         slackSend (color: '#FF0000', message: "FAILED:  Job  '${env.JOB_NAME}'  BUILD NUMBER:  '${env.BUILD_NUMBER}'  Job failed in stage docker-build ${server}. click <${env.RUN_DISPLAY_URL}|here> to see the log. Error: ${e}", channel: 'idestack-automation')
         throw(e)

From 93ad9781ba0b093d6c719dc8ac14d83dddb65b27 Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Tue, 17 Oct 2023 21:29:29 +0200
Subject: [PATCH 11/15] test

---
 Jenkinsfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 803a663a..f4744b5b 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -608,8 +608,8 @@ def generateBuildStage(server) {
       def version = getVersion(pwd() + params.DEPLOYMENT_PATH + "/${server}/package.json")
       def imageTag = "${REPOSITORY_SERVER}/${name}:${version}"
       sh "lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;"
-      docker.withRegistry('https://gcr.io', 'jenkins-gcr-login-key') {
-        def newImage = docker.build("$imageTag", "-f servers/$server/Dockerfile .")
+      def newImage = docker.build("$imageTag", "-f servers/$server/Dockerfile .")
+      docker.withRegistry('https://gcr.io', "gcr:jenkins-gcr-login-key") {
         newImage.push()
       }
       } catch (e) {

From d2d204a64a1dbd4487453bb885b347b0126c9930 Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Thu, 19 Oct 2023 13:22:58 +0200
Subject: [PATCH 12/15] test

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index f4744b5b..2ed00558 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -4,7 +4,7 @@ def GIT_BRANCH_NAME=getGitBranchName()
 pipeline {
   agent {
     kubernetes{
-      label 'slave-2cpu-8gb'
+      label 'slave-4cpu-16gb'
     }
   }
   parameters {

From 18607fd82a4952b4dc0eeb941fc884006a58f10e Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Thu, 19 Oct 2023 21:47:08 +0200
Subject: [PATCH 13/15] Change credentials id

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 2ed00558..eb607e7b 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -609,7 +609,7 @@ def generateBuildStage(server) {
       def imageTag = "${REPOSITORY_SERVER}/${name}:${version}"
       sh "lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;"
       def newImage = docker.build("$imageTag", "-f servers/$server/Dockerfile .")
-      docker.withRegistry('https://gcr.io', "gcr:jenkins-gcr-login-key") {
+      docker.withRegistry('https://gcr.io', "jenkins-gcr-login-sa") {
         newImage.push()
       }
       } catch (e) {

From 9dcf35fa73255ece5d519b4fd7344c4d19d24150 Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Thu, 19 Oct 2023 22:09:06 +0200
Subject: [PATCH 14/15] test

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index eb607e7b..805a7a03 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -609,7 +609,7 @@ def generateBuildStage(server) {
       def imageTag = "${REPOSITORY_SERVER}/${name}:${version}"
       sh "lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;"
       def newImage = docker.build("$imageTag", "-f servers/$server/Dockerfile .")
-      docker.withRegistry('https://gcr.io', "jenkins-gcr-login-sa") {
+      docker.withRegistry('https://gcr.io', "gcr:jenkins-gcr-login-sa") {
         newImage.push()
       }
       } catch (e) {

From c07e78397cfbc127ed82c344487c674c403f6800 Mon Sep 17 00:00:00 2001
From: Tomas <tomas@gmail.com>
Date: Fri, 20 Oct 2023 21:09:13 +0200
Subject: [PATCH 15/15] test

---
 Jenkinsfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Jenkinsfile b/Jenkinsfile
index 805a7a03..50072dc1 100755
--- a/Jenkinsfile
+++ b/Jenkinsfile
@@ -609,7 +609,7 @@ def generateBuildStage(server) {
       def imageTag = "${REPOSITORY_SERVER}/${name}:${version}"
       sh "lerna exec --scope=*${server} ${params.BUILD_STRATEGY} run build;"
       def newImage = docker.build("$imageTag", "-f servers/$server/Dockerfile .")
-      docker.withRegistry('https://gcr.io', "gcr:jenkins-gcr-login-sa") {
+      docker.withRegistry('https://gcr.io', "gcr:google-container-registry") {
         newImage.push()
       }
       } catch (e) {