diff --git a/.env.example b/.env.example index 1b79d583..f0eb63ab 100644 --- a/.env.example +++ b/.env.example @@ -33,6 +33,9 @@ STORAGE_TYPE=local # 流处理后端(memory/redis) STREAM_MANAGER_TYPE=redis +# 应用服务主机名,默认为app +APP_HOST=app + # 应用服务端口,默认为8080 APP_PORT=8080 diff --git a/docker-compose.yml b/docker-compose.yml index 4e97a5e6..92f2520f 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -10,6 +10,8 @@ services: - "${FRONTEND_PORT:-80}:80" environment: - MAX_FILE_SIZE_MB=${MAX_FILE_SIZE_MB:-50} + - APP_HOST=${APP_HOST:-app} + - APP_PORT=${APP_PORT:-8080} depends_on: app: condition: service_healthy diff --git a/frontend/docker-entrypoint.sh b/frontend/docker-entrypoint.sh index 8cd6c759..ff892d49 100644 --- a/frontend/docker-entrypoint.sh +++ b/frontend/docker-entrypoint.sh @@ -9,7 +9,9 @@ EOF # 处理 nginx 配置 export MAX_FILE_SIZE=${MAX_FILE_SIZE_MB}M -envsubst '${MAX_FILE_SIZE}' < /etc/nginx/templates/default.conf.template > /etc/nginx/conf.d/default.conf +export APP_HOST=${APP_HOST:-app} +export APP_PORT=${APP_PORT:-8080} +envsubst '${MAX_FILE_SIZE} ${APP_HOST} ${APP_PORT}' < /etc/nginx/templates/default.conf.template > /etc/nginx/conf.d/default.conf # 启动 nginx exec nginx -g 'daemon off;' diff --git a/frontend/nginx.conf b/frontend/nginx.conf index aa4b0ca1..26984307 100644 --- a/frontend/nginx.conf +++ b/frontend/nginx.conf @@ -23,7 +23,7 @@ server { # API请求代理到后端服务 location /api/ { - proxy_pass http://app:8080/api/; + proxy_pass http://${APP_HOST}:${APP_PORT}/api/; proxy_set_header Host $host; proxy_set_header X-Real-IP $remote_addr; proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; diff --git a/helm/templates/frontend.yaml b/helm/templates/frontend.yaml index 96754a91..15697856 100644 --- a/helm/templates/frontend.yaml +++ b/helm/templates/frontend.yaml @@ -41,6 +41,11 @@ spec: securityContext: {{- toYaml . | nindent 12 }} {{- end }} + env: + - name: APP_HOST + value: {{ .Values.frontend.appHost | default (printf "%s-app" (include "weknora.fullname" .)) | quote }} + - name: APP_PORT + value: {{ .Values.frontend.appPort | default .Values.app.service.port | quote }} ports: - containerPort: 80 name: http