From 95614175e6fc5b1d7754f4f324d9687f1a5d8bcd Mon Sep 17 00:00:00 2001 From: Jin Hai Date: Sat, 7 Dec 2024 11:04:45 +0800 Subject: [PATCH] Update oc9 docker compose file (#3913) ### What problem does this PR solve? Update OC9 docker compose files issue: #3901 ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue) Signed-off-by: jinhai --- docker/docker-compose-CN-oc9.yml | 16 +++++++++------- docker/docker-compose-gpu-CN-oc9.yml | 16 +++++++++------- 2 files changed, 18 insertions(+), 14 deletions(-) diff --git a/docker/docker-compose-CN-oc9.yml b/docker/docker-compose-CN-oc9.yml index 28e92831a..bb201fe37 100644 --- a/docker/docker-compose-CN-oc9.yml +++ b/docker/docker-compose-CN-oc9.yml @@ -1,14 +1,11 @@ include: - - path: ./docker-compose-base.yml - env_file: ./.env + - ./docker-compose-base.yml services: - ragflow: + ragflow: depends_on: mysql: condition: service_healthy - es01: - condition: service_healthy image: edwardelric233/ragflow:oc9 container_name: ragflow-server ports: @@ -20,10 +17,15 @@ services: - ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf - ./nginx/proxy.conf:/etc/nginx/proxy.conf - ./nginx/nginx.conf:/etc/nginx/nginx.conf + env_file: .env environment: - TZ=${TIMEZONE} - - HF_ENDPOINT=https://hf-mirror.com + - HF_ENDPOINT=${HF_ENDPOINT} - MACOS=${MACOS} networks: - ragflow - restart: always + restart: on-failure + # https://docs.docker.com/engine/daemon/prometheus/#create-a-prometheus-configuration + # If you're using Docker Desktop, the --add-host flag is optional. This flag makes sure that the host's internal IP gets exposed to the Prometheus container. + extra_hosts: + - "host.docker.internal:host-gateway" diff --git a/docker/docker-compose-gpu-CN-oc9.yml b/docker/docker-compose-gpu-CN-oc9.yml index e99dda5b6..d2e1c7c70 100644 --- a/docker/docker-compose-gpu-CN-oc9.yml +++ b/docker/docker-compose-gpu-CN-oc9.yml @@ -1,14 +1,11 @@ include: - - path: ./docker-compose-base.yml - env_file: ./.env + - ./docker-compose-base.yml services: - ragflow: + ragflow: depends_on: mysql: condition: service_healthy - es01: - condition: service_healthy image: edwardelric233/ragflow:oc9 container_name: ragflow-server ports: @@ -20,13 +17,18 @@ services: - ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf - ./nginx/proxy.conf:/etc/nginx/proxy.conf - ./nginx/nginx.conf:/etc/nginx/nginx.conf + env_file: .env environment: - TZ=${TIMEZONE} - - HF_ENDPOINT=https://hf-mirror.com + - HF_ENDPOINT=${HF_ENDPOINT} - MACOS=${MACOS} networks: - ragflow - restart: always + restart: on-failure + # https://docs.docker.com/engine/daemon/prometheus/#create-a-prometheus-configuration + # If you're using Docker Desktop, the --add-host flag is optional. This flag makes sure that the host's internal IP gets exposed to the Prometheus container. + extra_hosts: + - "host.docker.internal:host-gateway" deploy: resources: reservations: