fix:更新runner
This commit is contained in:
@@ -7,12 +7,6 @@ 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,26 +72,13 @@ 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" && "$REGISTRY" != "docker.io" ]]; 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
|
||||||
|
|
||||||
@@ -105,8 +86,8 @@ jobs:
|
|||||||
- 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 部分一致,否则 push 会 401
|
# 与 IMAGE_NAME 的 registry 保持一致
|
||||||
registry: ${{ env.REGISTRY }}
|
registry: docker.damer.fun
|
||||||
username: ${{ secrets.DOCKER_USERNAME }}
|
username: ${{ secrets.DOCKER_USERNAME }}
|
||||||
password: ${{ secrets.DOCKER_TOKEN }}
|
password: ${{ secrets.DOCKER_TOKEN }}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user