From 508290f4cb7577cbe55f7ac7ce44ce5e7446c0cb Mon Sep 17 00:00:00 2001 From: jeremygan2021 Date: Fri, 13 Feb 2026 10:15:10 +0800 Subject: [PATCH] 1 --- .gitea/workflows/deploy.yaml | 31 +++++++++++++++---------------- deploy.sh | 2 +- 2 files changed, 16 insertions(+), 17 deletions(-) diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml index 286ae44..13555a7 100644 --- a/.gitea/workflows/deploy.yaml +++ b/.gitea/workflows/deploy.yaml @@ -15,13 +15,13 @@ jobs: - name: 检出代码 uses: actions/checkout@v3 - # 1. 登录 Docker Registry - # 如果你使用 Docker Hub,请在 Gitea 仓库设置 -> Secrets 中配置 DOCKERHUB_USERNAME 和 DOCKERHUB_TOKEN - - name: 登录到 Docker Hub - uses: docker/login-action@v2 - with: - username: ${{ secrets.DOCKERHUB_USERNAME }} - password: ${{ secrets.DOCKERHUB_TOKEN }} + # 1. 登录 Docker Registry (已跳过,无密码模式) + # - name: 登录到私有 Registry + # uses: docker/login-action@v2 + # with: + # registry: 121.43.104.161:6500 + # username: ${{ secrets.DOCKER_REGISTRY_USER }} + # password: ${{ secrets.DOCKER_REGISTRY_PASSWORD }} # 2. 构建并推送镜像 - name: 构建并推送 Docker 镜像 @@ -29,11 +29,10 @@ jobs: with: context: . push: true - # 镜像标签,这里使用了 Docker Hub 用户名作为前缀 - tags: ${{ secrets.DOCKERHUB_USERNAME }}/quant-speed-page:latest + # 镜像标签,推送到私有 Registry + tags: 121.43.104.161:6500/quant-speed-page:latest # 3. 部署到服务器 - # 请在 Gitea 仓库设置 -> Secrets 中配置 SERVER_HOST, SERVER_USER, SERVER_PASSWORD - name: 部署到服务器 uses: appleboy/ssh-action@master with: @@ -41,19 +40,19 @@ jobs: username: ${{ secrets.SERVER_USER }} password: ${{ secrets.SERVER_PASSWORD }} script: | - # 停止并删除旧容器(如果存在) + # 停止并删除旧容器 docker stop quant-speed-page || true docker rm quant-speed-page || true + # 登录私有 Registry (如果需要) + # docker login 121.43.104.161:6500 -u ${{ secrets.DOCKER_REGISTRY_USER }} -p ${{ secrets.DOCKER_REGISTRY_PASSWORD }} + # 拉取最新镜像 - docker pull ${{ secrets.DOCKERHUB_USERNAME }}/quant-speed-page:latest + docker pull 121.43.104.161:6500/quant-speed-page:latest # 启动新容器 - # -d: 后台运行 - # --restart unless-stopped: 除非手动停止,否则自动重启 - # -p 80:80: 映射端口 docker run -d \ --name quant-speed-page \ --restart unless-stopped \ -p 80:80 \ - ${{ secrets.DOCKERHUB_USERNAME }}/quant-speed-page:latest + 121.43.104.161:6500/quant-speed-page:latest diff --git a/deploy.sh b/deploy.sh index 8338dbe..37894ee 100755 --- a/deploy.sh +++ b/deploy.sh @@ -9,7 +9,7 @@ # ========================================== # 设置变量 -SERVER_IP="139.224.233.33" +SERVER_IP="121.40.192.128" SERVER_PATH="/root/build" BUILD_DIR="build" SERVER_PASSWORD="123quant-speed"