feat: bugfix

ciandt-china-dev · Jan 9, 2025 · 599349d · 599349d
1 parent 73061d4
commit 599349d
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 5 deletions.
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
 
 env:
-  ACR_REGISTRY: haleon.azurecr.cn
+  ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
+  ACR_REGISTRY: ${{ secrets.ACR_REGISTRY }}
   ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
   KUBECONFIG_FILE: ${{ secrets.KUBECONFIG }}
 
@@ -20,7 +21,7 @@ jobs:
       - name: Login to Container Registry
         run: |
           docker login ${ACR_REGISTRY} \
-          -u "haleon" \
+          -u "${ACR_USERNAME}" \
           -p "${ACR_PASSWORD}"
 
       - name: Build Docker image

diff --git a/.github/workflows/microservice_deploy.yml b/.github/workflows/microservice_deploy.yml
@@ -4,7 +4,8 @@ on:
   workflow_dispatch:
 
 env:
-  ACR_REGISTRY: haleon.azurecr.cn
+  ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
+  ACR_REGISTRY: ${{ secrets.ACR_REGISTRY }}
   ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
   KUBECONFIG_FILE: ${{ secrets.KUBECONFIG }}
 
@@ -20,7 +21,7 @@ jobs:
       - name: Login to Container Registry
         run: |
           docker login ${ACR_REGISTRY} \
-          -u "haleon" \
+          -u "${ACR_USERNAME}" \
           -p "${ACR_PASSWORD}"
 
       - name: Build and push Docker image

diff --git a/deploy.yml.bak b/deploy.yml.bak
@@ -5,6 +5,7 @@ on:
     branches: [ main ]
 
 env:
+  ACR_USERNAME: ${{ secrets.ACR_USERNAME }}
   ACR_REGISTRY: ${{ secrets.ACR_REGISTRY }}
   ACR_PASSWORD: ${{ secrets.ACR_PASSWORD }}
   KUBECONFIG_FILE: ${{ secrets.KUBECONFIG }}
@@ -21,7 +22,7 @@ jobs:
       - name: Login to Container Registry
         run: |
           docker login ${ACR_REGISTRY} \
-          -u "haleon" \
+          -u "${ACR_USERNAME}" \
           -p "${ACR_PASSWORD}"
 
       - name: Build and push Docker image