diff --git a/README.md b/README.md index 9f75ed4..84962d9 100644 --- a/README.md +++ b/README.md @@ -2,4 +2,28 @@ ```python pytest -s src/test/test.py +``` + +## 打包基础镜像 + +```bash +cd docker +docker build -f ES_Dockerfile -t es-ik:8.4.1 . +``` + +## 结构 + +``` + Query + | + Query Rewrite + | + ┌──────┴────────┐ + | | + BM25 (ES) Vector (ES) + | | + └──────┬────────┘ + Merge / Rerank + | + LLM ``` \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml index e2ed891..27a1311 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -8,9 +8,9 @@ volumes: services: elasticsearch: - image: docker.elastic.co/elasticsearch/elasticsearch:9.2.2 + image: es-ik:8.4.1 container_name: elasticsearch - user: "1000:1000" + # user: "1000:1000" environment: - discovery.type=single-node # 单节点模式 - xpack.security.enabled=true # 开启安全 diff --git a/docker/ES_Dockerfile b/docker/ES_Dockerfile index df9d377..f55d1de 100644 --- a/docker/ES_Dockerfile +++ b/docker/ES_Dockerfile @@ -1,4 +1,6 @@ -FROM docker.elastic.co/elasticsearch/elasticsearch:9.2.2 +FROM docker.elastic.co/elasticsearch/elasticsearch:8.4.1 # 安装 IK 分词器, 最大兼容中文 -RUN bin/elasticsearch-plugin install https://get.infini.cloud/elasticsearch/analysis-ik/8.4.1 +RUN bin/elasticsearch-plugin install --batch \ + https://get.infini.cloud/elasticsearch/analysis-ik/8.4.1 +