Merge develop: nginx proxy_pass 永久修复 #184

Merged

xiaoxia merged 2 commits from develop into main 2026-07-03 13:36:05 +08:00

Conversation 0 Commits 2 Files Changed 2

+10 -2

xiaoxia commented 2026-07-03 13:35:57 +08:00

Owner

Copy Link

Copy Source

包含 nginx 配置永久修复：移除变量型 proxy_pass，使用静态配置指向容器名

包含 nginx 配置永久修复：移除变量型 proxy_pass，使用静态配置指向容器名

xiaoxia added 2 commits 2026-07-03 13:35:57 +08:00

fix: add Docker DNS resolver to nginx - prevent 502 after API container restart ... 22ef893b6b

- Add resolver 127.0.0.11 valid=10s for Docker internal DNS
- Use variable-based proxy_pass to force DNS re-resolution
- Prevents nginx from caching stale API container IP

fix: 永久修复 nginx proxy_pass 配置 ... 22c1085c4b

- staging nginx.conf: 使用静态 proxy_pass 替代变量型（避免 URI 丢失）
- staging 指向容器名 xiaoxia-api-staging（避免 DNS 别名冲突）
- 添加 proxy_read_timeout/proxy_send_timeout 300s（与 production 对齐）
- web.Dockerfile: 支持 ARG NGINX_CONF 参数化（与 web-artifact.Dockerfile 一致）
- production nginx-production.conf 已确认无需修改

xiaoxia merged commit 0d07febb78 into main 2026-07-03 13:36:05 +08:00

xiaoxia referenced this issue from a commit 2026-07-03 13:36:06 +08:00

Merge pull request 'Merge develop: nginx proxy_pass 永久修复' (#184) from develop into main

Sign in to join this conversation.

Reviewers

No Reviewers

Labels

Clear labels

P0

阻塞性，必须立即处理

P1

高优先级

P2

中优先级

P3

低优先级/后考虑

architecture

架构设计

backend

后端相关

blocked

阻塞中

bug

Bug修复

ci-bug

CI本身的bug

ci-optimization

CI优化类任务

ci-pipeline

CI流水线/workflow相关

cleanup

代码清理

devops

运维/部署/CI

documentation

文档相关

feature

新功能

frontend

前端相关

question

需要讨论确认

ready

PR CI通过，可合并

refactor

代码重构

No Label

Milestone

No items

No Milestone

Projects

Clear projects

No project

Assignees

Clear assignees

auto-approve-bot xiaoxia

No Assignees

1 Participants

Notifications

Subscribe

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: xiaoxia/xiaoxia-saas#184