7 Commits

Author SHA1 Message Date
吕新雨
2ddee6b8f8 fix:更新runner 2026-02-02 23:02:49 +08:00
吕新雨
aa530b0ce3 fix:更新runner 2026-02-02 22:58:42 +08:00
cdd0ac32de Merge pull request 'fix:更新自建仓库' (#13) from damer into main
Reviewed-on: #13
2026-02-02 14:50:28 +00:00
3c35e14c3d Merge pull request 'damer' (#12) from damer into main
Reviewed-on: #12
2026-02-02 14:47:30 +00:00
915e995ab7 Merge pull request 'fix:更新' (#11) from damer into main
Reviewed-on: #11
2026-02-02 14:26:16 +00:00
39e4bcab6c Merge pull request 'fix:更新server' (#10) from damer into main
Reviewed-on: #10
2026-02-02 14:22:49 +00:00
ceaf459d97 Merge pull request 'damer' (#9) from damer into main
Reviewed-on: #9
2026-02-02 14:01:03 +00:00

View File

@@ -72,33 +72,21 @@ jobs:
- name: Set image variables - name: Set image variables
shell: bash shell: bash
run: | run: |
# 自建镜像仓库地址例如docker.damer.fun 或 registry.example.com # 直接写死:推送到自建仓库
# 如要推送 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 if [[ -n "${GITHUB_ENV:-}" ]]; then
echo "REGISTRY=$REGISTRY" >> "$GITHUB_ENV"
echo "IMAGE_REPO=$IMAGE_REPO" >> "$GITHUB_ENV"
echo "IMAGE_NAME=$IMAGE_NAME" >> "$GITHUB_ENV" echo "IMAGE_NAME=$IMAGE_NAME" >> "$GITHUB_ENV"
fi fi
if [[ -n "${GITEA_ENV:-}" ]]; then if [[ -n "${GITEA_ENV:-}" ]]; then
echo "REGISTRY=$REGISTRY" >> "$GITEA_ENV"
echo "IMAGE_REPO=$IMAGE_REPO" >> "$GITEA_ENV"
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:
# 与 IMAGE_NAME 的 registry 保持一致
registry: docker.damer.fun registry: docker.damer.fun
username: ${{ secrets.DOCKER_USERNAME }} username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }} password: ${{ secrets.DOCKER_TOKEN }}