From fe846ab937bf70cfedbe89ea135255df2bb2bf21 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E6=8C=AF=E5=AE=87?= <>
Date: Mon, 10 Feb 2025 01:33:26 +0800
Subject: [PATCH] fix(pipeline): update Docker login commands to use
 environment variables for credentials
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: 孙振宇 <>
---
 .../src/com/freeleaps/devops/ImageBuilder.groovy              | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
index b8539a7c..6a411af6 100644
--- a/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
+++ b/first-class-pipeline/src/com/freeleaps/devops/ImageBuilder.groovy
@@ -31,10 +31,10 @@ class ImageBuilder {
       steps.log.info("ImageBuilder", "Authentication to ${registry}")
       switch(builderType) {
         case ImageBuilderTypes.DOCKER_IN_DOCKER:
-          steps.sh "docker login -u ${DOCKER_USERNAME} -p ${DOCKER_PASSWORD} ${registry}"
+          steps.sh "docker login -u ${steps.env.DOCKER_USERNAME} -p ${steps.env.DOCKER_PASSWORD} ${registry}"
           break
         case ImageBuilderTypes.KANIKO:
-          def auth = "${DOCKER_USERNAME}:${DOCKER_PASSWORD}".bytes.encodeBase64().toString()
+          def auth = "${steps.env.DOCKER_USERNAME}:${steps.env.DOCKER_PASSWORD}".bytes.encodeBase64().toString()
           steps.writeFile file: '/kaniko/.docker/config.json', text: """{
             "auths": {
               "${registry}": {