From cd6daf03a2408b58690bc023875a64f300e21d6f Mon Sep 17 00:00:00 2001
From: manhinhang <manhinhang@gmail.com>
Date: Wed, 24 Apr 2024 20:48:40 +0800
Subject: [PATCH] ci: remove workflow file

---
 .../workflows/{deploy-dockerhub.yml => deploy.yml} | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)
 rename .github/workflows/{deploy-dockerhub.yml => deploy.yml} (75%)

diff --git a/.github/workflows/deploy-dockerhub.yml b/.github/workflows/deploy.yml
similarity index 75%
rename from .github/workflows/deploy-dockerhub.yml
rename to .github/workflows/deploy.yml
index c697bee..1c20cad 100644
--- a/.github/workflows/deploy-dockerhub.yml
+++ b/.github/workflows/deploy.yml
@@ -18,14 +18,14 @@ jobs:
         include:
           # Dockerhub
           - images: manhinhang/ib-gateway-docker
-            username: ${{ secrets.DOCKERHUB_USERNAME }}
-            password: ${{ secrets.DOCKERHUB_PASSWORD }}
-            registry: 
+            username: DOCKERHUB_USERNAME
+            password: DOCKERHUB_PASSWORD
+            registry: ''
           # Github
           - images: ghcr.io/manhinhang/ib-gateway-docker
             username: ${{ github.actor }}
-            password: ${{ secrets.GITHUB_TOKEN }}
-            registry: ghcr.io
+            password: GITHUB_TOKEN
+            registry: 'ghcr.io'
     runs-on: ubuntu-latest
     timeout-minutes: 20
     steps:
@@ -39,8 +39,8 @@ jobs:
         uses: docker/login-action@v3
         with:
           registry: ${{ matrix.registry }}
-          username: ${{ matrix.username }}
-          password: ${{ matrix.password }}
+          username: ${{ startsWith(matrix.registry,'ghc') && matrix["username"] || secrets[matrix.username] }}
+          password: ${{ secrets[matrix.password] }}
       - name: Build and push
         uses: docker/build-push-action@v5
         with: