From 8a4643a7f13113099ebb2efa1b6ddbc129f2bda0 Mon Sep 17 00:00:00 2001
From: Endial Fang <endial@126.com>
Date: Fri, 26 Dec 2025 16:58:07 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BD=BF=E7=94=A8=E9=A1=B6=E5=B1=82=20s?=
 =?UTF-8?q?ecret=20=E6=96=B9=E5=BC=8F=E5=AF=BC=E5=85=A5=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E9=A1=B9=EF=BC=8C=E8=A7=84=E9=81=BF=20podman=20=E7=8E=AF?=
 =?UTF-8?q?=E5=A2=83=E5=8F=98=E9=87=8F=E5=BC=95=E5=85=A5=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .drone.yml | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/.drone.yml b/.drone.yml
index a5bdc58..4350e66 100644
--- a/.drone.yml
+++ b/.drone.yml
@@ -31,21 +31,25 @@ steps:
         path: /run/podman/podman.sock
       - name: containers-config
         path: /etc/containers
-    environment:
-      REGISTRY_USER:
-        from_secret: swr_username
-      REGISTRY_PASSWORD:
-        from_secret: swr_password
+    secrets:
+      - source: swr_username
+        target: swr_username
+      - source: swr_password
+        target: swr_password
     commands:
       - |
+        REGISTRY_USER=$(cat /run/secrets/swr_username)
+        REGISTRY_PASSWORD=$(cat /run/secrets/swr_password)
+        REGISTRY_SERVER="swr.cn-north-4.myhuaweicloud.com"
+        
         echo "Logging into registry..."
         # 调试：打印所有关键变量
         echo "=== Debug Variables ==="
-        echo "REGISTRY_SERVER: swr.cn-north-4.myhuaweicloud.com"
+        echo "REGISTRY_SERVER: $REGISTRY_SERVER"
         echo "REGISTRY_USER: ${REGISTRY_USER:-empty}"
         echo "REGISTRY_PASSWORD: ${REGISTRY_PASSWORD:-empty}"
         echo "========================"
-        podman login "swr.cn-north-4.myhuaweicloud.com" -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" || {
+        podman login "$REGISTRY_SERVER" -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" || {
           echo "Registry login failed!"
           exit 1
         }