From d16eccb4c222c0ae9c075b5c53f89ccfdc8ea13e Mon Sep 17 00:00:00 2001 From: lendry Date: Wed, 24 Jun 2026 16:42:07 +0300 Subject: [PATCH] fix idp on started --- docker-compose.yml | 12 +++++------ install.sh | 54 +++++++++------------------------------------- 2 files changed, 16 insertions(+), 50 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 408d1ba..21e1af7 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -59,8 +59,8 @@ services: MINIO_ROOT_USER: ${MINIO_ROOT_USER:-minioadmin} MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD:-minioadmin} ports: - - "9000:9000" - - "9001:9001" + - "127.0.0.1:9000:9000" + - "127.0.0.1:9001:9001" volumes: - minio_data:/data healthcheck: @@ -137,7 +137,7 @@ services: MINIO_USE_SSL: ${MINIO_USE_SSL:-false} PUBLIC_API_URL: ${PUBLIC_API_URL:-http://localhost:3000} ports: - - "3000:3000" + - "127.0.0.1:3000:3000" depends_on: sso-core: condition: service_healthy @@ -163,7 +163,7 @@ services: RABBITMQ_URL: amqp://${RABBITMQ_DEFAULT_USER:-lendry}:${RABBITMQ_DEFAULT_PASS:-lendry_password}@rabbitmq:5672/ JWT_ACCESS_SECRET: ${JWT_ACCESS_SECRET:-docker-access-secret} ports: - - "8085:8085" + - "127.0.0.1:8085:8085" depends_on: redis: condition: service_healthy @@ -210,7 +210,7 @@ services: NEXT_PUBLIC_API_URL: ${PUBLIC_API_URL:-http://localhost:3000} NEXT_PUBLIC_WS_URL: ${PUBLIC_WS_URL:-ws://localhost:8085/ws} ports: - - "3002:3000" + - "127.0.0.1:3002:3000" depends_on: api-gateway: condition: service_healthy @@ -240,7 +240,7 @@ services: NEXT_PUBLIC_API_URL: ${PUBLIC_API_URL:-http://localhost:3000} INTERNAL_API_URL: http://api-gateway:3000 ports: - - "3003:3000" + - "127.0.0.1:3003:3000" healthcheck: test: ["CMD-SHELL", "node -e \"fetch('http://localhost:3000/docs').then(r=>process.exit(r.ok?0:1)).catch(()=>process.exit(1))\""] interval: 10s diff --git a/install.sh b/install.sh index d65f005..53552c6 100644 --- a/install.sh +++ b/install.sh @@ -10,7 +10,7 @@ set -euo pipefail -SCRIPT_VERSION="2.2.0" +SCRIPT_VERSION="2.2.1" ROOT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)" cd "$ROOT_DIR" @@ -939,57 +939,23 @@ write_compose_override() { log "Настройка docker-compose override (Nginx: ${mode})..." - local minio_block="" - if [[ "$mode" == "host" && ( -n "$(env_get DOMAIN_MINIO "")" || -n "$(env_get DOMAIN_MINIO_CONSOLE "")" ) ]]; then - minio_block=" - minio: - ports: !reset - - \"127.0.0.1:9000:9000\" - - \"127.0.0.1:9001:9001\"" - else - minio_block=" - minio: - ports: !reset []" - fi + # Порты edge-сервисов и MinIO (127.0.0.1) заданы в docker-compose.yml. + # Override только добавляет Docker Nginx при NGINX_MODE=docker. if [[ "$mode" == "docker" ]]; then - local http_port https_port nginx_ports + local http_port https_port http_port="$(env_get NGINX_HTTP_PORT 80)" https_port="$(env_get NGINX_HTTPS_PORT 443)" - nginx_ports=" - nginx: - ports: !reset - - \"${http_port}:80\" - - \"${https_port}:443\"" cat >"$COMPOSE_OVERRIDE" <"$COMPOSE_OVERRIDE" <