Merge pull request 'fix:更新' (#11) from damer into main

Reviewed-on: #11

.gitea/workflows/server-build.yml

@@ -68,40 +68,25 @@ jobs:
             echo "IMAGE_TAG=${NEXT_TAG}" >> "$GITEA_ENV"
           fi
 
-      # 3️⃣ 设置镜像仓库与镜像名称（自建 Registry / Docker Hub 都可）
+      # 3️⃣ 设置 Docker 镜像名称
       - name: Set image variables
         shell: bash
         run: |
-          # 自建镜像仓库地址（例如：docker.damer.fun 或 registry.example.com）
+          # 修改为你的 Docker Hub 仓库名，例如：yourname/mindfulness-server
-          # 如要推送 Docker Hub：可把 REGISTRY 留空并把 IMAGE_REPO 设置为 yourname/xxx
+          IMAGE_NAME=docker.damer.fun/damer/mindfulness-server
-          REGISTRY="${DOCKER_REGISTRY:-docker.damer.fun}"
-          # 镜像仓库路径（不含 registry）
-          IMAGE_REPO="${DOCKER_IMAGE_REPO:-damer/mindfulness-server}"
-
-          if [[ -n "$REGISTRY" ]]; then
-            IMAGE_NAME="$REGISTRY/$IMAGE_REPO"
-          else
-            IMAGE_NAME="$IMAGE_REPO"
-          fi
-
           if [[ -n "${GITHUB_ENV:-}" ]]; then
-            echo "REGISTRY=$REGISTRY" >> "$GITHUB_ENV"
-            echo "IMAGE_REPO=$IMAGE_REPO" >> "$GITHUB_ENV"
             echo "IMAGE_NAME=$IMAGE_NAME" >> "$GITHUB_ENV"
           fi
           if [[ -n "${GITEA_ENV:-}" ]]; then
-            echo "REGISTRY=$REGISTRY" >> "$GITEA_ENV"
-            echo "IMAGE_REPO=$IMAGE_REPO" >> "$GITEA_ENV"
             echo "IMAGE_NAME=$IMAGE_NAME" >> "$GITEA_ENV"
           fi
 
-      # 4️⃣ 登录镜像仓库（自建 Registry）
+      # 4️⃣ 登录 Docker Hub
-      - name: Login to Docker Registry
+      - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
-          registry: docker.damer.fun
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          username: ${{ secrets.DOCKER_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
-          password: ${{ secrets.DOCKER_TOKEN }}
 
       # 5️⃣ 构建 Docker 镜像（使用 server/ 作为构建上下文）
       - name: Build Docker Image
@@ -109,7 +94,7 @@ jobs:
         run: |
           docker build -f server/Dockerfile -t "$IMAGE_NAME:$IMAGE_TAG" server
 
-      # 6️⃣ 推送 Docker 镜像到镜像仓库
+      # 6️⃣ 推送 Docker 镜像到 Docker Hub
       - name: Push Docker Image
         shell: bash
         run: |