From 9da42296c3dbe12d9d39e9444c8a92b1a9d7d166 Mon Sep 17 00:00:00 2001
From: CattySteve <cattysteve89265@163.com>
Date: Wed, 5 Jun 2024 20:57:15 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9E=84=E5=BB=BA=E8=84=9A?=
 =?UTF-8?q?=E6=9C=AC-2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitea/workflows/build.yaml | 14 +-------------
 build.sh                    |  2 +-
 2 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/.gitea/workflows/build.yaml b/.gitea/workflows/build.yaml
index 061411f..1bb27d0 100644
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -7,18 +7,6 @@ jobs:
     steps:
     - name: 检出
       uses: actions/checkout@master
-    - name: 测试1
-      run: ls
     - name: 构建docker容器
-      run: bash build.sh
-    - name: 测试2
-      run: 'echo "${{ var.DOCKER_REGISTRY }} ${{gitea.username}}"'
-    - name: 登录docker
-      run: 'docker login ${{ var.DOCKER_REGISTRY }} -u ${{ gitea.username }} -p ${{ secrets.DOCKER_PASSWORD }}'
-    - name: 更名docker容器
-      run: 'docker tag galaxymusichallv2_convert ${{var.DOCKER_REGISTRY}}/${{gitea.username}}/galaxymusichallv2_convert:latest'
-    - name: 推送docker容器
-      run: 'docker push ${{ var.DOCKER_REGISTRY }}/${{ gitea.username }}/galaxymusichallv2_convert:latest'
-    - name: 测试3
-      run: echo "如果这句话输出了，那么gitea actions就只能运行有一个参数的指令"
+      run: bash build.sh push ${{ secrets.DOCKER_PASSWORD }}
 
diff --git a/build.sh b/build.sh
index 0bcb323..e5d6136 100644
--- a/build.sh
+++ b/build.sh
@@ -41,7 +41,7 @@ echo "[5/5] 推送docker镜像"
 if [ a$1 == apush ]
 then
     docker tag galaxymusichallv2_convert:latest gitea.cattysteve.top/pig2014/galaxymusichallv2_convert:latest
-    docker login gitea.cattysteve.top -u pig2014 -p ${DOCKER_PASSWORD}
+    docker login gitea.cattysteve.top -u pig2014 -p $2
     docker push gitea.cattysteve.top/pig2014/galaxymusichallv2_convert:latest
     echo "推送完成！"
 else