Commit
·
d512196
1
Parent(s):
28e0efa
Update oc9 docker compose file (#3913)
Browse files### 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 <[email protected]>
docker/docker-compose-CN-oc9.yml
CHANGED
|
@@ -1,14 +1,11 @@
|
|
| 1 |
include:
|
| 2 |
-
-
|
| 3 |
-
env_file: ./.env
|
| 4 |
|
| 5 |
services:
|
| 6 |
-
|
| 7 |
depends_on:
|
| 8 |
mysql:
|
| 9 |
condition: service_healthy
|
| 10 |
-
es01:
|
| 11 |
-
condition: service_healthy
|
| 12 |
image: edwardelric233/ragflow:oc9
|
| 13 |
container_name: ragflow-server
|
| 14 |
ports:
|
|
@@ -20,10 +17,15 @@ services:
|
|
| 20 |
- ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf
|
| 21 |
- ./nginx/proxy.conf:/etc/nginx/proxy.conf
|
| 22 |
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
|
|
|
|
| 23 |
environment:
|
| 24 |
- TZ=${TIMEZONE}
|
| 25 |
-
- HF_ENDPOINT
|
| 26 |
- MACOS=${MACOS}
|
| 27 |
networks:
|
| 28 |
- ragflow
|
| 29 |
-
restart:
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| 1 |
include:
|
| 2 |
+
- ./docker-compose-base.yml
|
|
|
|
| 3 |
|
| 4 |
services:
|
| 5 |
+
ragflow:
|
| 6 |
depends_on:
|
| 7 |
mysql:
|
| 8 |
condition: service_healthy
|
|
|
|
|
|
|
| 9 |
image: edwardelric233/ragflow:oc9
|
| 10 |
container_name: ragflow-server
|
| 11 |
ports:
|
|
|
|
| 17 |
- ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf
|
| 18 |
- ./nginx/proxy.conf:/etc/nginx/proxy.conf
|
| 19 |
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
|
| 20 |
+
env_file: .env
|
| 21 |
environment:
|
| 22 |
- TZ=${TIMEZONE}
|
| 23 |
+
- HF_ENDPOINT=${HF_ENDPOINT}
|
| 24 |
- MACOS=${MACOS}
|
| 25 |
networks:
|
| 26 |
- ragflow
|
| 27 |
+
restart: on-failure
|
| 28 |
+
# https://docs.docker.com/engine/daemon/prometheus/#create-a-prometheus-configuration
|
| 29 |
+
# 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.
|
| 30 |
+
extra_hosts:
|
| 31 |
+
- "host.docker.internal:host-gateway"
|
docker/docker-compose-gpu-CN-oc9.yml
CHANGED
|
@@ -1,14 +1,11 @@
|
|
| 1 |
include:
|
| 2 |
-
-
|
| 3 |
-
env_file: ./.env
|
| 4 |
|
| 5 |
services:
|
| 6 |
-
|
| 7 |
depends_on:
|
| 8 |
mysql:
|
| 9 |
condition: service_healthy
|
| 10 |
-
es01:
|
| 11 |
-
condition: service_healthy
|
| 12 |
image: edwardelric233/ragflow:oc9
|
| 13 |
container_name: ragflow-server
|
| 14 |
ports:
|
|
@@ -20,13 +17,18 @@ services:
|
|
| 20 |
- ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf
|
| 21 |
- ./nginx/proxy.conf:/etc/nginx/proxy.conf
|
| 22 |
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
|
|
|
|
| 23 |
environment:
|
| 24 |
- TZ=${TIMEZONE}
|
| 25 |
-
- HF_ENDPOINT
|
| 26 |
- MACOS=${MACOS}
|
| 27 |
networks:
|
| 28 |
- ragflow
|
| 29 |
-
restart:
|
|
|
|
|
|
|
|
|
|
|
|
|
| 30 |
deploy:
|
| 31 |
resources:
|
| 32 |
reservations:
|
|
|
|
| 1 |
include:
|
| 2 |
+
- ./docker-compose-base.yml
|
|
|
|
| 3 |
|
| 4 |
services:
|
| 5 |
+
ragflow:
|
| 6 |
depends_on:
|
| 7 |
mysql:
|
| 8 |
condition: service_healthy
|
|
|
|
|
|
|
| 9 |
image: edwardelric233/ragflow:oc9
|
| 10 |
container_name: ragflow-server
|
| 11 |
ports:
|
|
|
|
| 17 |
- ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf
|
| 18 |
- ./nginx/proxy.conf:/etc/nginx/proxy.conf
|
| 19 |
- ./nginx/nginx.conf:/etc/nginx/nginx.conf
|
| 20 |
+
env_file: .env
|
| 21 |
environment:
|
| 22 |
- TZ=${TIMEZONE}
|
| 23 |
+
- HF_ENDPOINT=${HF_ENDPOINT}
|
| 24 |
- MACOS=${MACOS}
|
| 25 |
networks:
|
| 26 |
- ragflow
|
| 27 |
+
restart: on-failure
|
| 28 |
+
# https://docs.docker.com/engine/daemon/prometheus/#create-a-prometheus-configuration
|
| 29 |
+
# 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.
|
| 30 |
+
extra_hosts:
|
| 31 |
+
- "host.docker.internal:host-gateway"
|
| 32 |
deploy:
|
| 33 |
resources:
|
| 34 |
reservations:
|