1 Commits

Author SHA1 Message Date
吕新雨
aa530b0ce3 fix:更新runner 2026-02-02 22:58:42 +08:00

View File

@@ -7,6 +7,12 @@ on:
jobs: jobs:
build-and-push: build-and-push:
runs-on: ubuntu-latest runs-on: ubuntu-latest
env:
# 可选:在仓库 Secrets 中配置这些值(更方便在不同环境复用)
# - DOCKER_REGISTRY: 例如 docker.damer.fun自建 registry 域名)
# - DOCKER_IMAGE_REPO: 例如 damer/mindfulness-server不含 registry
DOCKER_REGISTRY: ${{ secrets.DOCKER_REGISTRY }}
DOCKER_IMAGE_REPO: ${{ secrets.DOCKER_IMAGE_REPO }}
steps: steps:
# 1⃣ Checkout 仓库代码 # 1⃣ Checkout 仓库代码
@@ -78,7 +84,7 @@ jobs:
# 镜像仓库路径(不含 registry # 镜像仓库路径(不含 registry
IMAGE_REPO="${DOCKER_IMAGE_REPO:-damer/mindfulness-server}" IMAGE_REPO="${DOCKER_IMAGE_REPO:-damer/mindfulness-server}"
if [[ -n "$REGISTRY" ]]; then if [[ -n "$REGISTRY" && "$REGISTRY" != "docker.io" ]]; then
IMAGE_NAME="$REGISTRY/$IMAGE_REPO" IMAGE_NAME="$REGISTRY/$IMAGE_REPO"
else else
IMAGE_NAME="$IMAGE_REPO" IMAGE_NAME="$IMAGE_REPO"
@@ -95,11 +101,12 @@ jobs:
echo "IMAGE_NAME=$IMAGE_NAME" >> "$GITEA_ENV" echo "IMAGE_NAME=$IMAGE_NAME" >> "$GITEA_ENV"
fi fi
# 4⃣ 登录镜像仓库(自建 Registry # 4⃣ 登录镜像仓库(自建 Registry / Docker Hub
- name: Login to Docker Registry - name: Login to Docker Registry
uses: docker/login-action@v3 uses: docker/login-action@v3
with: with:
registry: docker.damer.fun # 必须与 IMAGE_NAME 的 registry 部分一致,否则 push 会 401
registry: ${{ env.REGISTRY }}
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }} password: ${{ secrets.DOCKER_TOKEN }}