Skip to content

Commit

Permalink
Merge pull request #237 from netease-youdao/develop_for_v1.3.3
Browse files Browse the repository at this point in the history
解决跨域问题,加载前端静态资源即可访问页面,启动更快
解决ES权限问题
mysql连接数增大到32
不再限制N卡型号,废弃显卡型号查表,使用pycuda查询显卡算力
  • Loading branch information
successren authored Apr 9, 2024
2 parents 527a04c + 4a28f94 commit da7c5f4
Show file tree
Hide file tree
Showing 135 changed files with 535 additions and 8,257 deletions.
45 changes: 22 additions & 23 deletions docker-compose-linux.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
version: '3.5'

services:
elasticsearch:
container_name: es-container-local
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4"
privileged: true
# ports:
# - 9200:9200
# - 9300:9300
restart: on-failure
environment:
- discovery.type=single-node
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
volumes:
- ${DOCKER_VOLUME_DIRECTORY:-.}/third_party/es/plugins:/usr/share/elasticsearch/plugins
- ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/es/data:/usr/share/elasticsearch/data
healthcheck:
test: curl --fail http://localhost:9200/_cat/health || exit 1
interval: 30s
timeout: 20s
retries: 3

etcd:
container_name: milvus-etcd-local
image: quay.io/coreos/etcd:v3.5.5
Expand Down Expand Up @@ -65,27 +86,6 @@ services:
- "etcd"
- "minio"

elasticsearch:
container_name: es-container-local
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4"
privileged: true
ports:
- 9200:9200
- 9300:9300
restart: on-failure
environment:
- discovery.type=single-node
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
volumes:
- ${DOCKER_VOLUME_DIRECTORY:-.}/third_party/es/plugins:/usr/share/elasticsearch/plugins
- ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/es/data:/usr/share/elasticsearch/data
healthcheck:
test: curl --fail http://localhost:9200/_cat/health || exit 1
interval: 30s
timeout: 20s
retries: 3

mysql:
container_name: mysql-container-local
privileged: true
Expand All @@ -99,7 +99,7 @@ services:

qanything_local:
container_name: qanything-container-local
image: freeren/qanything:v1.2.1
image: freeren/qanything:v1.2.2
# runtime: nvidia
deploy:
resources:
Expand All @@ -117,7 +117,6 @@ services:
- ${DOCKER_VOLUME_DIRECTORY:-.}/assets/custom_models:/model_repos/CustomLLM
- ${DOCKER_VOLUME_DIRECTORY:-.}/:/workspace/qanything_local/
ports:
- "5052:5052"
- "8777:8777"
environment:
- NCCL_LAUNCH_MODE=PARALLEL
Expand Down
45 changes: 22 additions & 23 deletions docker-compose-windows.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,27 @@
version: '3.5'

services:
elasticsearch:
container_name: es-container-local
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4"
privileged: true
# ports:
# - 9200:9200
# - 9300:9300
restart: on-failure
environment:
- discovery.type=single-node
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
volumes:
- ${DOCKER_VOLUME_DIRECTORY:-.}/third_party/es/plugins:/usr/share/elasticsearch/plugins
- ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/es/data:/usr/share/elasticsearch/data
healthcheck:
test: curl --fail http://localhost:9200/_cat/health || exit 1
interval: 30s
timeout: 20s
retries: 3

etcd:
container_name: milvus-etcd-local
image: quay.io/coreos/etcd:v3.5.5
Expand Down Expand Up @@ -65,27 +86,6 @@ services:
- "etcd"
- "minio"

elasticsearch:
container_name: es-container-local
image: "docker.elastic.co/elasticsearch/elasticsearch:8.11.4"
privileged: true
ports:
- 9200:9200
- 9300:9300
restart: on-failure
environment:
- discovery.type=single-node
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xms1024m -Xmx1024m"
volumes:
- ${DOCKER_VOLUME_DIRECTORY:-.}/third_party/es/plugins:/usr/share/elasticsearch/plugins
- ${DOCKER_VOLUME_DIRECTORY:-.}/volumes/es/data:/usr/share/elasticsearch/data
healthcheck:
test: curl --fail http://localhost:9200/_cat/health || exit 1
interval: 30s
timeout: 20s
retries: 3

mysql:
container_name: mysql-container-local
privileged: true
Expand All @@ -99,7 +99,7 @@ services:

qanything_local:
container_name: qanything-container-local
image: freeren/qanything-win:v1.2.1
image: freeren/qanything-win:v1.2.2
# runtime: nvidia
deploy:
resources:
Expand All @@ -115,7 +115,6 @@ services:
- ${DOCKER_VOLUME_DIRECTORY:-.}/assets/custom_models:/model_repos/CustomLLM
- ${DOCKER_VOLUME_DIRECTORY:-.}/:/workspace/qanything_local/
ports:
- "5052:5052"
- "8777:8777"
environment:
- NCCL_LAUNCH_MODE=PARALLEL
Expand Down
5 changes: 0 additions & 5 deletions front_end/.env.development

This file was deleted.

4 changes: 0 additions & 4 deletions front_end/.env.production

This file was deleted.

5 changes: 0 additions & 5 deletions front_end/.eslintignore

This file was deleted.

39 changes: 0 additions & 39 deletions front_end/.eslintrc.js

This file was deleted.

11 changes: 0 additions & 11 deletions front_end/.prettierrc.js

This file was deleted.

57 changes: 0 additions & 57 deletions front_end/README.md

This file was deleted.

77 changes: 0 additions & 77 deletions front_end/package.json

This file was deleted.

45 changes: 0 additions & 45 deletions front_end/src/App.vue

This file was deleted.

Binary file removed front_end/src/assets/home/avatar.png
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-add.png
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-back.png
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-document.png
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-email.png
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-folder.png
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-home.png
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-loading.png
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-reload.png
Binary file not shown.
Binary file removed front_end/src/assets/home/icon-search.png
Binary file not shown.
Loading

0 comments on commit da7c5f4

Please sign in to comment.