chore: complete infrastructure config, contracts, reference images and ui redesign artifacts
This commit is contained in:
@@ -1,5 +1,4 @@
|
||||
# 丹阳公益婚恋服务平台 - Backend
|
||||
version: '3.8'
|
||||
# 丹阳公益婚恋服务平台 - 本地完整环境
|
||||
|
||||
services:
|
||||
postgres:
|
||||
@@ -89,18 +88,29 @@ services:
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
|
||||
admin-web:
|
||||
build:
|
||||
context: ../admin-web
|
||||
dockerfile: Dockerfile
|
||||
container_name: danyang-match-admin
|
||||
depends_on:
|
||||
backend:
|
||||
condition: service_healthy
|
||||
|
||||
nginx:
|
||||
image: nginx:alpine
|
||||
container_name: danyang-match-nginx
|
||||
depends_on:
|
||||
- backend
|
||||
backend:
|
||||
condition: service_healthy
|
||||
admin-web:
|
||||
condition: service_started
|
||||
ports:
|
||||
- "80:80"
|
||||
- "443:443"
|
||||
- "6688:80"
|
||||
volumes:
|
||||
- ./nginx.conf:/etc/nginx/nginx.conf:ro
|
||||
healthcheck:
|
||||
test: ["CMD", "curl", "-f", "http://localhost/health"]
|
||||
test: ["CMD-SHELL", "wget -qO /dev/null http://localhost/nginx-health || exit 1"]
|
||||
interval: 30s
|
||||
timeout: 10s
|
||||
retries: 3
|
||||
|
||||
+13
-11
@@ -38,6 +38,10 @@ http {
|
||||
server backend:8080;
|
||||
}
|
||||
|
||||
upstream admin_web {
|
||||
server admin-web:80;
|
||||
}
|
||||
|
||||
server {
|
||||
listen 80;
|
||||
server_name localhost;
|
||||
@@ -59,6 +63,8 @@ http {
|
||||
proxy_connect_timeout 30s;
|
||||
proxy_send_timeout 60s;
|
||||
proxy_read_timeout 60s;
|
||||
add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
|
||||
add_header Pragma "no-cache";
|
||||
}
|
||||
|
||||
# WebSocket proxy
|
||||
@@ -84,17 +90,13 @@ http {
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
|
||||
# Admin web static files
|
||||
location /admin/ {
|
||||
root /usr/share/nginx/html;
|
||||
index index.html;
|
||||
try_files $uri $uri/ /admin/index.html;
|
||||
}
|
||||
|
||||
# Don't cache API responses
|
||||
location /api/ {
|
||||
add_header Cache-Control "no-store, no-cache, must-revalidate, proxy-revalidate, max-age=0";
|
||||
add_header Pragma "no-cache";
|
||||
# Admin web
|
||||
location / {
|
||||
proxy_pass http://admin_web;
|
||||
proxy_set_header Host $host;
|
||||
proxy_set_header X-Real-IP $remote_addr;
|
||||
proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
|
||||
proxy_set_header X-Forwarded-Proto $scheme;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user