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

@@ -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" <<EOF
services:
api-gateway:
ports: !reset []
frontend:
ports: !reset []
docs:
ports: !reset []
media-ws:
ports: !reset []
${minio_block}${nginx_ports}
nginx:
ports:
- "${http_port}:80"
- "${https_port}:443"
EOF
else
cat >"$COMPOSE_OVERRIDE" <<EOF
services:
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
# host Nginx — override не нужен; удаляем старый (мог содержать ports: !reset [])
[[ -f "$COMPOSE_OVERRIDE" ]] && rm -f "$COMPOSE_OVERRIDE"
fi
}