From b7f72d9dbfde599c490e65344fe8f507cf988a1f Mon Sep 17 00:00:00 2001
From: Guillem Hernandez Sola <guillem@agile611.com>
Date: Wed, 15 Apr 2026 12:02:59 +0200
Subject: [PATCH] Changes in Docker Agent

---
 BuildJenkinsfileAgentAlpine | 14 +++++++++-----
 BuildJenkinsfileAgentDebian |  2 +-
 BuildJenkinsfileAgentUbuntu | 14 +++++++++-----
 3 files changed, 19 insertions(+), 11 deletions(-)

diff --git a/BuildJenkinsfileAgentAlpine b/BuildJenkinsfileAgentAlpine
index ff44904..cca932e 100644
--- a/BuildJenkinsfileAgentAlpine
+++ b/BuildJenkinsfileAgentAlpine
@@ -11,19 +11,23 @@ pipeline {
         DOCKER_HUB_USER='guillemhs'
         IMAGE_NAME="${DOCKER_HUB_USER}/jenkins-alpine-agent"
         REGISTRY_CRED_ID='docker-credentials'
+                
+        // Executem una comanda shell per obtenir la data actual i la guardem com a variable
+        DATA = sh(returnStdout: true, script: 'date +%Y.%m.%d').trim()
+        TAG="${DATA}.${env.BUILD_NUMBER}"
     }
     stages {
         stage('Checkout') {
             steps {
                 // Get some code from a GIT repository
-                git branch: 'main', url: 'https://git.agile611.com/Agile611/startusingjenkins.git'
+                checkout scm
             }
         }
         stage('Docker Build') {
             steps {
                 script{
                     echo "Build image ..."
-                    docker.build("${IMAGE_NAME}:${env.BUILD_NUMBER}","-f DockerfileAgentAlpine .")
+                    docker.build("${IMAGE_NAME}:${TAG}","-f DockerfileAgentAlpine .")
                 }
             }
         }
@@ -32,10 +36,10 @@ pipeline {
             steps{
                 script{
                     docker.withRegistry('',REGISTRY_CRED_ID){
-                        def app = docker.image("${IMAGE_NAME}:${env.BUILD_NUMBER}")
+                        def app = docker.image("${IMAGE_NAME}:${TAG}")
                         
                         echo "Pushing image to Docker Hub ..."
-                        app.push("${env.BUILD_NUMBER}")
+                        app.push("${TAG}")
                         app.push("latest")
                     }
                 }
@@ -45,7 +49,7 @@ pipeline {
     post{
         always{
             //cleanWs()
-            sh "docker rmi ${IMAGE_NAME}:${env.BUILD_NUMBER} || true"
+            sh "docker rmi ${IMAGE_NAME}:${TAG} || true"
             sh "docker rmi ${IMAGE_NAME}:latest || true"
         }
     }
diff --git a/BuildJenkinsfileAgentDebian b/BuildJenkinsfileAgentDebian
index 5db738f..a80d908 100644
--- a/BuildJenkinsfileAgentDebian
+++ b/BuildJenkinsfileAgentDebian
@@ -49,7 +49,7 @@ pipeline {
     post{
         always{
             //cleanWs()
-            sh "docker rmi ${IMAGE_NAME}:${env.BUILD_NUMBER} || true"
+            sh "docker rmi ${IMAGE_NAME}:${TAG} || true"
             sh "docker rmi ${IMAGE_NAME}:latest || true"
         }
     }
diff --git a/BuildJenkinsfileAgentUbuntu b/BuildJenkinsfileAgentUbuntu
index ee65ee1..662896e 100644
--- a/BuildJenkinsfileAgentUbuntu
+++ b/BuildJenkinsfileAgentUbuntu
@@ -11,19 +11,23 @@ pipeline {
         DOCKER_HUB_USER='guillemhs'
         IMAGE_NAME="${DOCKER_HUB_USER}/jenkins-ubuntu2404-agent"
         REGISTRY_CRED_ID='docker-credentials'
+                
+        // Executem una comanda shell per obtenir la data actual i la guardem com a variable
+        DATA = sh(returnStdout: true, script: 'date +%Y.%m.%d').trim()
+        TAG="${DATA}.${env.BUILD_NUMBER}"
     }
     stages {
         stage('Checkout') {
             steps {
                 // Get some code from a GIT repository
-                git branch: 'main', url: 'https://git.agile611.com/Agile611/startusingjenkins.git'
+                checkout scm
             }
         }
         stage('Docker Build') {
             steps {
                 script{
                     echo "Build image ..."
-                    docker.build("${IMAGE_NAME}:${env.BUILD_NUMBER}","-f DockerfileAgent2404 .")
+                    docker.build("${IMAGE_NAME}:${TAG}","-f DockerfileAgent2404 .")
                 }
             }
         }
@@ -32,10 +36,10 @@ pipeline {
             steps{
                 script{
                     docker.withRegistry('',REGISTRY_CRED_ID){
-                        def app = docker.image("${IMAGE_NAME}:${env.BUILD_NUMBER}")
+                        def app = docker.image("${IMAGE_NAME}:${TAG}")
                         
                         echo "Pushing image to Docker Hub ..."
-                        app.push("${env.BUILD_NUMBER}")
+                        app.push("${TAG}")
                         app.push("latest")
                     }
                 }
@@ -45,7 +49,7 @@ pipeline {
     post{
         always{
             //cleanWs()
-            sh "docker rmi ${IMAGE_NAME}:${env.BUILD_NUMBER} || true"
+            sh "docker rmi ${IMAGE_NAME}:${TAG} || true"
             sh "docker rmi ${IMAGE_NAME}:latest || true"
         }
     }