From 201e29b9d1a3f30c1b4ad1e6820bef7110b49050 Mon Sep 17 00:00:00 2001 From: HasanKulbuzhev Date: Fri, 13 Mar 2026 11:48:42 +0300 Subject: [PATCH] merge fix conflicts --- docker-compose.yml | 64 ++++++++++++++++++++++++++++++++++++++------- livekit/egress.yaml | 20 ++++++++++++++ 2 files changed, 74 insertions(+), 10 deletions(-) create mode 100644 livekit/egress.yaml diff --git a/docker-compose.yml b/docker-compose.yml index 5ed9410..fe4c634 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -26,6 +26,39 @@ services: labels: - "traefik.enable=false" + minio: + image: minio/minio:latest + command: server /data --console-address ":9001" + environment: + MINIO_ROOT_USER: ${MINIO_ROOT_USER} + MINIO_ROOT_PASSWORD: ${MINIO_ROOT_PASSWORD} + TZ: Europe/Moscow + volumes: + - ./minio_data:/data + networks: + - ns-eatvio + - web + ports: + - "9010:9000" # S3 API + - "9011:9001" # Web-консоль MinIO (опционально) + labels: + - "traefik.docker.network=web" + - "traefik.enable=true" + - "traefik.frontend.rule=Host:${MINIO_PUBLIC_HOST}" + - "traefik.port=9000" + - "traefik.protocol=http" + + typesense: + image: typesense/typesense:29.0 + restart: on-failure + networks: + - ns-eatvio + volumes: + - ./typesense-data:/data + command: "--data-dir /data --api-key=typesense --enable-cors" + labels: + - "traefik.enable=false" + mysql: image: "mysql:8.0" working_dir: /application @@ -146,16 +179,7 @@ services: livekit-redis: image: redis:7-alpine - command: - [ - "redis-server", - "--appendonly", - "no", - "--maxmemory", - "500mb", - "--maxmemory-policy", - "allkeys-lru", - ] + command: ["redis-server", "--appendonly", "no", "--maxmemory", "500mb", "--maxmemory-policy", "allkeys-lru"] networks: - ns-eatvio volumes: @@ -164,6 +188,26 @@ services: labels: - "traefik.enable=false" + livekit-egress: + image: livekit/egress:latest + restart: always + depends_on: + - livekit + - livekit-redis + networks: + - ns-eatvio + environment: + LIVEKIT_API_KEY: ${LIVEKIT_API_KEY} + LIVEKIT_API_SECRET: ${LIVEKIT_API_SECRET} + + LIVEKIT_URL: https://livekit.eatv.io + + REDIS_HOST: livekit-redis:6379 + + EGRESS_CONFIG_FILE: /config/egress.yaml + volumes: + - ./livekit/egress.yaml:/config/egress.yaml:ro + livekit: image: livekit/livekit-server:latest depends_on: diff --git a/livekit/egress.yaml b/livekit/egress.yaml new file mode 100644 index 0000000..03e82b7 --- /dev/null +++ b/livekit/egress.yaml @@ -0,0 +1,20 @@ +api_key: APITRajpYFYdtk3 +api_secret: VKCfO954C3OU0IeeXxZ1fiUDx9ZmWtvNNp9fCHRfO2JH + +# куда стучаться за задачами +ws_url: wss://livekit.eatv.io + +# redis тот же, что и у livekit +redis: + address: livekit-redis:6379 + +# S3/MinIO — глобальные дефолты (не обязательно, Laravel уже передаёт s3 в каждом запросе, +# но так удобнее для egress CLI / тестов) +storage: + s3: + access_key: minioadmin + secret: minioadminpass + region: us-east-1 + bucket: eatvio-recordings + endpoint: https://testing.eatv.io + force_path_style: true