mirror of
https://git.mirrors.martin98.com/https://github.com/infiniflow/ragflow.git
synced 2025-04-21 13:40:00 +08:00
191587346c
### What problem does this PR solve? https://github.com/infiniflow/ragflow/issues/4319 This pull request includes several changes to improve the Docker setup and documentation for the project. The most important changes include updating the Dockerfile to support modern versions of Rust, adding a new Docker Compose configuration for macOS, and updating the build instructions in the documentation. Improvements to Docker setup: * [`Dockerfile`](diffhunk://#diff-dd2c0eb6ea5cfc6c4bd4eac30934e2d5746747af48fef6da689e85b752f39557L80-R107): Added installation steps for a modern version of Rust and updated the logic for installing the correct ODBC driver based on the architecture. * [`docker/docker-compose-macos.yml`](diffhunk://#diff-8e8587143bb2442c02f6dff4caa217ebbe3ba4ec8e7c23b2e568886a67b00eafR1-R56): Added a new Docker Compose configuration file specifically for macOS, including service dependencies, environment variables, and volume mappings. Updates to documentation: * [`docs/guides/develop/build_docker_image.mdx`](diffhunk://#diff-d6136bb897f7245aae33b0accbcf7c508ceaef005c545f9f09cad3cada840a19L44-R44): Updated the build instructions to use the new Docker Compose configuration for macOS instead of the previous Docker build command. ### Type of change - [x] Bug Fix (non-breaking change which fixes an issue) - [x] Documentation Update --------- Signed-off-by: Samuel Giffard <samuel.giffard@mytomorrows.com>
57 lines
1.8 KiB
YAML
57 lines
1.8 KiB
YAML
include:
|
|
- ./docker-compose-base.yml
|
|
|
|
services:
|
|
ragflow:
|
|
depends_on:
|
|
mysql:
|
|
condition: service_healthy
|
|
build:
|
|
context: ../
|
|
dockerfile: Dockerfile
|
|
container_name: ragflow-server
|
|
ports:
|
|
- ${SVR_HTTP_PORT}:9380
|
|
- 80:80
|
|
- 443:443
|
|
volumes:
|
|
- ./ragflow-logs:/ragflow/logs
|
|
- ./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=${HF_ENDPOINT}
|
|
- MACOS=${MACOS:-1}
|
|
- LIGHTEN=${LIGHTEN:-1}
|
|
networks:
|
|
- ragflow
|
|
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"
|
|
# executor:
|
|
# depends_on:
|
|
# mysql:
|
|
# condition: service_healthy
|
|
# image: ${RAGFLOW_IMAGE}
|
|
# container_name: ragflow-executor
|
|
# volumes:
|
|
# - ./ragflow-logs:/ragflow/logs
|
|
# - ./nginx/ragflow.conf:/etc/nginx/conf.d/ragflow.conf
|
|
# env_file: .env
|
|
# environment:
|
|
# - TZ=${TIMEZONE}
|
|
# - HF_ENDPOINT=${HF_ENDPOINT}
|
|
# - MACOS=${MACOS}
|
|
# entrypoint: "/ragflow/entrypoint_task_executor.sh 1 3"
|
|
# networks:
|
|
# - ragflow
|
|
# 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"
|