From df19752a1e0082baab7a967e07c5aac40f3005f9 Mon Sep 17 00:00:00 2001 From: freefire Date: Sun, 23 Aug 2026 18:37:01 +0800 Subject: [PATCH] =?UTF-8?q?chore:=20=E7=A7=BB=E9=99=A4=20GitHub=20Actions?= =?UTF-8?q?=20=E5=B7=A5=E4=BD=9C=E6=B5=81=EF=BC=8C=E9=81=BF=E5=85=8D=20Git?= =?UTF-8?q?ea=20=E6=A3=80=E6=9F=A5=E5=A4=B1=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 仓库托管在 Gitea,镜像改由本地手动构建推送到 Docker Hub。 Co-authored-by: Cursor --- .github/workflows/docker.yml | 58 ------------------------------------ README.md | 13 ++++++-- 2 files changed, 10 insertions(+), 61 deletions(-) delete mode 100644 .github/workflows/docker.yml diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml deleted file mode 100644 index df2c8af..0000000 --- a/.github/workflows/docker.yml +++ /dev/null @@ -1,58 +0,0 @@ -# 构建并推送 Docker 镜像到 Docker Hub -# 前置条件:在 GitHub 仓库 Secrets 中配置 -# DOCKERHUB_USERNAME — Docker Hub 用户名 -# DOCKERHUB_TOKEN — Docker Hub Access Token(需 Read & Write 权限) - -name: Docker - -on: - push: - branches: - - main - tags: - - 'v*' - -env: - IMAGE_NAME: hangzhang714128/jiang13-forum - -jobs: - docker: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v4 - - - name: 计算镜像标签与版本 - id: meta - run: | - IMAGE="${{ env.IMAGE_NAME }}" - TAGS="${IMAGE}:latest" - if [[ "${{ github.ref_type }}" == "tag" ]]; then - RAW="${GITHUB_REF#refs/tags/}" - VER="${RAW#v}" - TAGS="${TAGS},${IMAGE}:${VER},${IMAGE}:${RAW}" - echo "version=${VER}" >> "$GITHUB_OUTPUT" - else - SHA="${GITHUB_SHA::7}" - TAGS="${TAGS},${IMAGE}:sha-${SHA}" - echo "version=dev" >> "$GITHUB_OUTPUT" - fi - echo "tags=${TAGS}" >> "$GITHUB_OUTPUT" - - - name: 登录 Docker Hub - uses: docker/login-action@v3 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} - - - name: 构建并推送镜像 - uses: docker/build-push-action@v6 - with: - context: . - push: true - platforms: linux/amd64 - build-args: | - VERSION=${{ steps.meta.outputs.version }} - IMAGE_PREFIX= - tags: ${{ steps.meta.outputs.tags }} diff --git a/README.md b/README.md index c883ff9..c40e27c 100644 --- a/README.md +++ b/README.md @@ -199,12 +199,19 @@ docker run -d --name jiang13 \ **健康检查:** `GET /health` 返回 `{"status":"ok"}`,供 Docker / 负载均衡探活。 -**CI 自动构建镜像:** 向 GitHub `main` 分支 push 或打 `v*` 标签后,GitHub Actions 会构建并推送到 [Docker Hub](https://hub.docker.com/r/hangzhang714128/jiang13-forum)。需在 GitHub 仓库 Secrets 中配置 `DOCKERHUB_USERNAME` 与 `DOCKERHUB_TOKEN`(Access Token,需 Read & Write 权限)。 - -**手动推送:** +**发布镜像到 Docker Hub(手动):** ```bash docker login +.\build.bat -Target docker # Windows +# make docker # Linux/macOS +docker push hangzhang714128/jiang13-forum:1.0.0 +docker push hangzhang714128/jiang13-forum:latest +``` + +或直接构建: + +```bash docker build --build-arg VERSION=1.0.0 -t hangzhang714128/jiang13-forum:1.0.0 -t hangzhang714128/jiang13-forum:latest . docker push hangzhang714128/jiang13-forum:1.0.0 docker push hangzhang714128/jiang13-forum:latest