fix idp on started

This commit is contained in:
lendry
2026-06-24 16:42:07 +03:00
parent 36f30039ad
commit d16eccb4c2
2 changed files with 16 additions and 50 deletions

View File

@@ -59,8 +59,8 @@ services:
MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minioadmin} MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minioadmin}
MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minioadmin} MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minioadmin}
ports: ports:
- "9000:9000" - "127.0.0.1:9000:9000"
- "9001:9001" - "127.0.0.1:9001:9001"
volumes: volumes:
- minio_data:/data - minio_data:/data
healthcheck: healthcheck:
@@ -137,7 +137,7 @@ services:
MINIO_USE_SSL: ${MINIO_USE_SSL:-false} MINIO_USE_SSL: ${MINIO_USE_SSL:-false}
PUBLIC_API_URL: ${PUBLIC_API_URL:-http://localhost:3000} PUBLIC_API_URL: ${PUBLIC_API_URL:-http://localhost:3000}
ports: ports:
- "3000:3000" - "127.0.0.1:3000:3000"
depends_on: depends_on:
sso-core: sso-core:
condition: service_healthy condition: service_healthy
@@ -163,7 +163,7 @@ services:
RABBITMQ_URL: amqp://${RABBITMQ_DEFAULT_USER:-lendry}:${RABBITMQ_DEFAULT_PASS:-lendry_password}@rabbitmq:5672/ RABBITMQ_URL: amqp://${RABBITMQ_DEFAULT_USER:-lendry}:${RABBITMQ_DEFAULT_PASS:-lendry_password}@rabbitmq:5672/
JWT_ACCESS_SECRET: ${JWT_ACCESS_SECRET:-docker-access-secret} JWT_ACCESS_SECRET: ${JWT_ACCESS_SECRET:-docker-access-secret}
ports: ports:
- "8085:8085" - "127.0.0.1:8085:8085"
depends_on: depends_on:
redis: redis:
condition: service_healthy condition: service_healthy
@@ -210,7 +210,7 @@ services:
NEXT_PUBLIC_API_URL: ${PUBLIC_API_URL:-http://localhost:3000} NEXT_PUBLIC_API_URL: ${PUBLIC_API_URL:-http://localhost:3000}
NEXT_PUBLIC_WS_URL: ${PUBLIC_WS_URL:-ws://localhost:8085/ws} NEXT_PUBLIC_WS_URL: ${PUBLIC_WS_URL:-ws://localhost:8085/ws}
ports: ports:
- "3002:3000" - "127.0.0.1:3002:3000"
depends_on: depends_on:
api-gateway: api-gateway:
condition: service_healthy condition: service_healthy
@@ -240,7 +240,7 @@ services:
NEXT_PUBLIC_API_URL: ${PUBLIC_API_URL:-http://localhost:3000} NEXT_PUBLIC_API_URL: ${PUBLIC_API_URL:-http://localhost:3000}
INTERNAL_API_URL: http://api-gateway:3000 INTERNAL_API_URL: http://api-gateway:3000
ports: ports:
- "3003:3000" - "127.0.0.1:3003:3000"
healthcheck: healthcheck:
test: ["CMD-SHELL", "node -e \"fetch('http://localhost:3000/docs').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))\""] test: ["CMD-SHELL", "node -e \"fetch('http://localhost:3000/docs').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))\""]
interval: 10s interval: 10s

View File

@@ -10,7 +10,7 @@
set -euo pipefail set -euo pipefail
SCRIPT_VERSION="2.2.0" SCRIPT_VERSION="2.2.1"
ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
cd "$ROOT_DIR" cd "$ROOT_DIR"
@@ -939,57 +939,23 @@ write_compose_override() {
log "Настройка docker-compose override (Nginx: ${mode})..." log "Настройка docker-compose override (Nginx: ${mode})..."
local minio_block="" # Порты edge-сервисов и MinIO (127.0.0.1) заданы в docker-compose.yml.
if [[ "$mode" == "host" && ( -n "$(env_get DOMAIN_MINIO "")" || -n "$(env_get DOMAIN_MINIO_CONSOLE "")" ) ]]; then # Override только добавляет Docker Nginx при NGINX_MODE=docker.
minio_block="
minio:
ports: !reset
- \"127.0.0.1:9000:9000\"
- \"127.0.0.1:9001:9001\""
else
minio_block="
minio:
ports: !reset []"
fi
if [[ "$mode" == "docker" ]]; then if [[ "$mode" == "docker" ]]; then
local http_port https_port nginx_ports local http_port https_port
http_port="$(env_get NGINX_HTTP_PORT 80)" http_port="$(env_get NGINX_HTTP_PORT 80)"
https_port="$(env_get NGINX_HTTPS_PORT 443)" https_port="$(env_get NGINX_HTTPS_PORT 443)"
nginx_ports="
nginx:
ports: !reset
- \"${http_port}:80\"
- \"${https_port}:443\""
cat >"$COMPOSE_OVERRIDE" <<EOF cat >"$COMPOSE_OVERRIDE" <<EOF
services: services:
api-gateway: nginx:
ports: !reset [] ports:
frontend: - "${http_port}:80"
ports: !reset [] - "${https_port}:443"
docs:
ports: !reset []
media-ws:
ports: !reset []
${minio_block}${nginx_ports}
EOF EOF
else else
cat >"$COMPOSE_OVERRIDE" <<EOF # host Nginx — override не нужен; удаляем старый (мог содержать ports: !reset [])
services: [[ -f "$COMPOSE_OVERRIDE" ]] && rm -f "$COMPOSE_OVERRIDE"
api-gateway:
ports: !reset
- "127.0.0.1:3000:3000"
frontend:
ports: !reset
- "127.0.0.1:3002:3000"
docs:
ports: !reset
- "127.0.0.1:3003:3000"
media-ws:
ports: !reset
- "127.0.0.1:8085:8085"
${minio_block}
EOF
fi fi
} }