From 073b3bc2f8574ca710f9fd04c406f3332952509d Mon Sep 17 00:00:00 2001
From: Alejandro Sarmiento <alejandrosarsan@protonmail.com>
Date: Mon, 11 Mar 2024 21:16:47 +0100
Subject: [PATCH] env.REGISTRY_URL

---
 CleanArchitecture/Pro.Jenkinsfile | 24 +++++++++++++-----------
 1 file changed, 13 insertions(+), 11 deletions(-)

diff --git a/CleanArchitecture/Pro.Jenkinsfile b/CleanArchitecture/Pro.Jenkinsfile
index ecc5bab..511e709 100644
--- a/CleanArchitecture/Pro.Jenkinsfile
+++ b/CleanArchitecture/Pro.Jenkinsfile
@@ -26,20 +26,22 @@ pipeline {
                 script {
                     def version = "0.0.${env.BUILD_NUMBER}"
                     def imageName = "clean-architecture-backend:${version}"
-            
-                    withCredentials([
-                        string(credentialsId: 'docker-registry-url', variable: 'REGISTRY_URL'),
-                        usernamePassword(credentialsId: 'dockerregistryalexdev', usernameVariable: 'REGISTRY_USER', passwordVariable: 'REGISTRY_PASSWORD')
-                    ]) {
-                        def fullImageName = "${REGISTRY_URL}/${imageName}"
-                
+                    
+                    // Usando withCredentials para manejar el REGISTRY_URL
+                    withCredentials([string(credentialsId: 'docker-registry-url', variable: 'REGISTRY_URL')]) {
+                        // Aquí usamos env.REGISTRY_URL para asegurarnos de que estamos usando la variable de entorno correcta
+                        def fullImageName = "env.REGISTRY_URL/${imageName}"
+                        
                         // Construir la imagen
                         sh "docker build --build-arg ENVIRONMENT=${env.ASP_ENVIRONMENT} -t ${imageName} ./CleanArchitecture/"
-                
+                        
                         // Iniciar sesión y subir la imagen
-                        sh "echo ${REGISTRY_PASSWORD} | docker login ${REGISTRY_URL} -u ${REGISTRY_USER} --password-stdin"
-                        sh "docker tag ${imageName} ${fullImageName}"
-                        sh "docker push ${fullImageName}"
+                        docker.withRegistry(env.REGISTRY_URL, 'dockerregistryalexdev') {
+                        echo "Vamos a ejecutar el docker tag"
+                            sh "docker tag ${imageName} ${fullImageName}"
+                            echo "Vamos a ejecutar el docker push"
+                            sh "docker push ${fullImageName}"
+                        }
                     }
                 }
             }