From a8bf8c709aac4e429a054a554a787e176f061b26 Mon Sep 17 00:00:00 2001 From: Your Name Date: Mon, 22 Jun 2026 16:59:15 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9B=B4=E6=96=B0=E7=AB=AF=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitea/workflows/main.yml | 19 ++++++++++--------- docker/nginx.conf | 3 +-- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.gitea/workflows/main.yml b/.gitea/workflows/main.yml index be9e9b4..321a0d7 100644 --- a/.gitea/workflows/main.yml +++ b/.gitea/workflows/main.yml @@ -27,7 +27,6 @@ jobs: with: context: . push: true - # 禁用所有缓存,确保每次都是全新构建 no-cache: true build-args: | BUILD_VERSION=${{ github.sha }} @@ -53,32 +52,34 @@ jobs: # 登录阿里云镜像仓库 docker login --username=${{ vars.ALIYUN_USERNAME }} --password=${{ secrets.ALIYUN_PASSWORD }} ${{ vars.ALIYUN_REGISTRY }} + # 确保网络存在 + docker network inspect web-network >/dev/null 2>&1 || docker network create web-network + # 停止并删除旧容器 docker stop website-01 2>/dev/null || true docker rm website-01 2>/dev/null || true - # 删除旧镜像(强制重新拉取) + # 删除旧镜像 docker rmi ${{ vars.ALIYUN_REGISTRY }}/${{ vars.ALIYUN_NAMESPACE }}/${{ vars.ALIYUN_REPO }}:latest 2>/dev/null || true - # 强制拉取最新镜像 + # 拉取最新镜像 docker pull ${{ vars.ALIYUN_REGISTRY }}/${{ vars.ALIYUN_NAMESPACE }}/${{ vars.ALIYUN_REPO }}:latest - # 运行新容器 + # 运行新容器(不映射端口到宿主机) docker run -d \ --name website-01 \ --restart always \ - -p 80:3002 \ + --network web-network \ -e NODE_OPTIONS="--max-old-space-size=4096" \ -e NODE_ENV="production" \ ${{ vars.ALIYUN_REGISTRY }}/${{ vars.ALIYUN_NAMESPACE }}/${{ vars.ALIYUN_REPO }}:latest + # 将 NPM 容器也连接到同一网络(如果还没连接) + docker network connect web-network nginx-proxy-manager 2>/dev/null || true + # 等待启动 sleep 3 - # 查看 BUILD_ID 确认更新 - echo "=== Build ID ===" - docker exec -it website-01 cat .next/BUILD_ID 2>/dev/null || echo "Cannot read BUILD_ID" - # 查看日志 echo "" echo "=== Container Logs ===" diff --git a/docker/nginx.conf b/docker/nginx.conf index 08687a3..df2db0e 100755 --- a/docker/nginx.conf +++ b/docker/nginx.conf @@ -45,8 +45,7 @@ http { # HTTP 服务器 server { listen 80; - listen [::]:80; - server_name _; + server_name localhost; # 静态资源缓存(由 Next.js 提供) location /_next/static {