build(docker): 更新 Docker 配置和镜像
- 修改 application-ymx-docker.yaml 中的数据库和 API 地址 - 更新 docker.env 中的数据库配置- 调整 docker-compose.yml 中的服务定义和网络配置 - 修改 Dockerfile 中的工作目录和启动命令 - 更新 logback-spring.xml 中的日志配置
This commit is contained in:
parent
21cb3684c3
commit
fb433414a9
@ -1,11 +1,9 @@
|
||||
version: "3.4"
|
||||
|
||||
name: yudao-system
|
||||
version: "3.3"
|
||||
|
||||
services:
|
||||
mysql:
|
||||
container_name: yudao-mysql
|
||||
image: mysql:8
|
||||
container_name: mysql
|
||||
image: m.daocloud.io/docker.io/mysql
|
||||
restart: unless-stopped
|
||||
tty: true
|
||||
ports:
|
||||
@ -19,7 +17,7 @@ services:
|
||||
|
||||
redis:
|
||||
container_name: yudao-redis
|
||||
image: redis:6-alpine
|
||||
image: m.daocloud.io/docker.io/redis
|
||||
restart: unless-stopped
|
||||
ports:
|
||||
- "6379:6379"
|
||||
@ -28,10 +26,10 @@ services:
|
||||
|
||||
server:
|
||||
container_name: yudao-server
|
||||
build:
|
||||
context: ./yudao-server/
|
||||
image: yudao-server
|
||||
restart: unless-stopped
|
||||
# build:
|
||||
# context: ./yudao-server/
|
||||
image: crpi-yaxyc8k2krkbnrmv.cn-hangzhou.personal.cr.aliyuncs.com/llm-server/xhllm-server
|
||||
restart: no
|
||||
ports:
|
||||
- "48080:48080"
|
||||
environment:
|
||||
@ -44,10 +42,10 @@ services:
|
||||
-Djava.security.egd=file:/dev/./urandom
|
||||
}
|
||||
ARGS:
|
||||
--spring.datasource.dynamic.datasource.master.url=${MASTER_DATASOURCE_URL:-jdbc:mysql://yudao-mysql:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true}
|
||||
--spring.datasource.dynamic.datasource.master.url=${MASTER_DATASOURCE_URL:-jdbc:mysql://mysql:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true}
|
||||
--spring.datasource.dynamic.datasource.master.username=${MASTER_DATASOURCE_USERNAME:-root}
|
||||
--spring.datasource.dynamic.datasource.master.password=${MASTER_DATASOURCE_PASSWORD:-123456}
|
||||
--spring.datasource.dynamic.datasource.slave.url=${SLAVE_DATASOURCE_URL:-jdbc:mysql://yudao-mysql:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true}
|
||||
--spring.datasource.dynamic.datasource.slave.url=${SLAVE_DATASOURCE_URL:-jdbc:mysql://mysql:3306/ruoyi-vue-pro?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true}
|
||||
--spring.datasource.dynamic.datasource.slave.username=${SLAVE_DATASOURCE_USERNAME:-root}
|
||||
--spring.datasource.dynamic.datasource.slave.password=${SLAVE_DATASOURCE_PASSWORD:-123456}
|
||||
--spring.redis.host=${REDIS_HOST:-yudao-redis}
|
||||
|
||||
@ -1,12 +1,13 @@
|
||||
## mysql
|
||||
MYSQL_DATABASE=ruoyi-vue-pro
|
||||
MYSQL_ROOT_PASSWORD=123456
|
||||
MYSQL_DATABASE=xhllm
|
||||
MYSQL_ROOT_USERNAME=llm
|
||||
MYSQL_ROOT_PASSWORD=ymxllm123#
|
||||
|
||||
## server
|
||||
JAVA_OPTS=-Xms512m -Xmx512m -Djava.security.egd=file:/dev/./urandom
|
||||
|
||||
MASTER_DATASOURCE_URL=jdbc:mysql://yudao-mysql:3306/${MYSQL_DATABASE}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
|
||||
MASTER_DATASOURCE_USERNAME=root
|
||||
MASTER_DATASOURCE_URL=jdbc:mysql://mysql:3306/${MYSQL_DATABASE}?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true
|
||||
MASTER_DATASOURCE_USERNAME=${MYSQL_ROOT_USERNAME}
|
||||
MASTER_DATASOURCE_PASSWORD=${MYSQL_ROOT_PASSWORD}
|
||||
SLAVE_DATASOURCE_URL=${MASTER_DATASOURCE_URL}
|
||||
SLAVE_DATASOURCE_USERNAME=${MASTER_DATASOURCE_USERNAME}
|
||||
|
||||
@ -3,10 +3,10 @@
|
||||
FROM eclipse-temurin:8-jre
|
||||
|
||||
## 创建目录，并使用它作为工作目录
|
||||
RUN mkdir -p /yudao-server
|
||||
WORKDIR /yudao-server
|
||||
RUN mkdir -p /home/ubuntu/work/project/system-server
|
||||
WORKDIR /system-server
|
||||
## 将后端项目的 Jar 文件，复制到镜像中
|
||||
COPY ./target/yudao-server.jar app.jar
|
||||
COPY yudao-server.jar app.jar
|
||||
|
||||
## 设置 TZ 时区
|
||||
ENV TZ=Asia/Shanghai
|
||||
@ -20,4 +20,4 @@ ENV ARGS=""
|
||||
EXPOSE 48080
|
||||
|
||||
## 启动后端项目
|
||||
CMD java ${JAVA_OPTS} -jar app.jar $ARGS
|
||||
CMD ["sh", "-c", "java ${JAVA_OPTS} -jar app.jar ${ARGS}"]
|
||||
|
||||
@ -46,12 +46,12 @@ spring:
|
||||
primary: master
|
||||
datasource:
|
||||
master:
|
||||
url: jdbc:mysql://127.0.0.1:3306/xhllm?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
|
||||
url: jdbc:mysql://18.210.203.44:3306/xhllm?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&nullCatalogMeansCurrent=true&rewriteBatchedStatements=true # MySQL Connector/J 8.X 连接的示例
|
||||
username: llm
|
||||
password: ymxllm123#
|
||||
slave: # 模拟从库，可根据自己需要修改
|
||||
lazy: true # 开启懒加载，保证启动速度
|
||||
url: jxdbc:mysql://127.0.0.1:3306/xhllm?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
|
||||
url: jxdbc:mysql://18.210.203.44:3306/xhllm?useSSL=false&serverTimezone=Asia/Shanghai&allowPublicKeyRetrieval=true&rewriteBatchedStatements=true&nullCatalogMeansCurrent=true
|
||||
username: llm
|
||||
password: ymxllm123#
|
||||
|
||||
@ -133,7 +133,7 @@ spring:
|
||||
admin:
|
||||
# Spring Boot Admin Client 客户端的相关配置
|
||||
client:
|
||||
url: http://127.0.0.1:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
|
||||
url: http://18.210.203.44:${server.port}/${spring.boot.admin.context-path} # 设置 Spring Boot Admin Server 地址
|
||||
instance:
|
||||
service-host-type: IP # 注册实例时，优先使用 IP [IP, HOST_NAME, CANONICAL_HOST_NAME]
|
||||
# Spring Boot Admin Server 服务端的相关配置
|
||||
@ -249,23 +249,23 @@ llm:
|
||||
#################### 8123: RAG服务、训练集和标注相关API。 ###################
|
||||
### RAG服务
|
||||
#RAG健康检查 GET
|
||||
rag_health: http://127.0.0.1:8123/health
|
||||
rag_health: http://18.210.203.44:8123/health
|
||||
#上传并向量化 POST
|
||||
rag_embed: http://127.0.0.1:8123/embed
|
||||
rag_embed: http://18.210.203.44:8123/embed
|
||||
#获取所有向量id GET
|
||||
rag_ids: http://127.0.0.1:8123/ids
|
||||
rag_ids: http://18.210.203.44:8123/ids
|
||||
#根据id获取文档 GET
|
||||
rag_documents: http://127.0.0.1:8123/documents
|
||||
rag_documents: http://18.210.203.44:8123/documents
|
||||
#根据id删除文档 DEL
|
||||
rag_documents_del: http://127.0.0.1:8123/documents
|
||||
rag_documents_del: http://18.210.203.44:8123/documents
|
||||
#根据file_id检索向量 POST
|
||||
rag_query: http://127.0.0.1:8123/query
|
||||
rag_query: http://18.210.203.44:8123/query
|
||||
#支持多个文件id查询向量 GET
|
||||
rag_query_multiple: http://127.0.0.1:8123/query_multiple
|
||||
rag_query_multiple: http://18.210.203.44:8123/query_multiple
|
||||
# 知识库向量嵌入
|
||||
embed: http://127.0.0.1:8123/embed
|
||||
embed: http://18.210.203.44:8123/embed
|
||||
# 知识库查询
|
||||
embed_query: http://127.0.0.1:8123/query
|
||||
embed_query: http://18.210.203.44:8123/query
|
||||
|
||||
#### LLM train and service api 训练集、标注相关API
|
||||
# 训练集列表 GET
|
||||
@ -283,22 +283,22 @@ llm:
|
||||
|
||||
#################### 9000: 大模型管理、微调任务、文件上传和模型部署相关API。 ###################
|
||||
# 大模型列表 GET
|
||||
models_list: http://127.0.0.1:9000/api/models
|
||||
models_list: http://18.210.203.44:9000/api/models
|
||||
# 登录 POST
|
||||
login: http://127.0.0.1:9000/api/auth/login
|
||||
account: http://127.0.0.1:9000/api/auth/account
|
||||
login: http://18.210.203.44:9000/api/auth/login
|
||||
account: http://18.210.203.44:9000/api/auth/account
|
||||
login_username: admin
|
||||
login_password: admin
|
||||
# 微调任务详情 GET
|
||||
finetuning_detail: http://127.0.0.1:9000/api/finetuning
|
||||
finetuning_detail: http://18.210.203.44:9000/api/finetuning
|
||||
# 微调任务取消
|
||||
finetuning_cancel: http://127.0.0.1:9000/api/finetuning/%s/cancel
|
||||
finetuning_cancel: http://18.210.203.44:9000/api/finetuning/%s/cancel
|
||||
# 微调文件列表 GET
|
||||
finetuning_file_list: http://127.0.0.1:9000/api/files?purpose=fine-tune
|
||||
finetuning_file_list: http://18.210.203.44:9000/api/files?purpose=fine-tune
|
||||
# 模型部署
|
||||
model_create: http://127.0.0.1:9000/api/models
|
||||
model_create: http://18.210.203.44:9000/api/models
|
||||
# aigc模型推理
|
||||
aigc_model_completions: http://127.0.0.1:9000/api/channels/chat/completions
|
||||
aigc_model_completions: http://18.210.203.44:9000/api/channels/chat/completions
|
||||
|
||||
|
||||
#################### 5123: 微调任务、模型部署、文件管理、提示词优化、自动评估、文生图等API。 ###################
|
||||
@ -319,28 +319,28 @@ llm:
|
||||
# 模型文件下载
|
||||
model_file_download: /models/download/?file_path=
|
||||
# 提示词优化
|
||||
optimize_prompt: http://127.0.0.1:5123/optimize-prompt
|
||||
optimize_prompt: http://18.210.203.44:5123/optimize-prompt
|
||||
# 自动评估
|
||||
auto_evaluation: /llm-eval
|
||||
# 文生图
|
||||
text_to_image: http://127.0.0.1:5123/generate-image
|
||||
text_to_image: http://18.210.203.44:5123/generate-image
|
||||
# 检查点文件列表
|
||||
check_file_list: /llm/finetuning/checkpoints?model_name=
|
||||
# 模型调优停止 POST
|
||||
stop_finetuning: /llm/finetuning/stop
|
||||
# 基座模型状态 POST
|
||||
base_model_status: http://127.0.0.1:5123/llm/deploy/list
|
||||
base_model_status: http://18.210.203.44:5123/llm/deploy/list
|
||||
# 模型部署 POST
|
||||
deploy_model: http://127.0.0.1:5123/llm/deploy
|
||||
deploy_model: http://18.210.203.44:5123/llm/deploy
|
||||
# 模型删除
|
||||
delete_model: http://127.0.0.1:5123/llm/deploy/stop
|
||||
delete_model: http://18.210.203.44:5123/llm/deploy/stop
|
||||
|
||||
#################### 30000: 大模型对话相关API。 ###################
|
||||
#### 大模型对话
|
||||
# 模型列表 GET
|
||||
base_model_list: http://127.0.0.1:30000/model/v1/models
|
||||
base_model_list: http://18.210.203.44:30000/model/v1/models
|
||||
# 模型对话 POST
|
||||
model_completions: http://127.0.0.1:30000/v1/chat/completions
|
||||
model_completions: http://18.210.203.44:30000/v1/chat/completions
|
||||
|
||||
#################### 48080: 应用和管理服务相关API。 ###################
|
||||
application_api: http://localhost:48080/admin-api/llm/application/api/apiKey/chat
|
||||
|
||||
@ -57,7 +57,7 @@
|
||||
</appender>
|
||||
|
||||
<!-- 本地环境 -->
|
||||
<springProfile name="local">
|
||||
<springProfile name="local,prod">
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT"/>
|
||||
<appender-ref ref="GRPC"/> <!-- 本地环境下，如果不想接入 SkyWalking 日志服务，可以注释掉本行 -->
|
||||
@ -65,7 +65,7 @@
|
||||
</root>
|
||||
</springProfile>
|
||||
<!-- 其它环境 -->
|
||||
<springProfile name="dev,test,stage,prod,default,ymx">
|
||||
<springProfile name="dev,test,stage,prod,default,ymx,local-ly,ymx-docker">
|
||||
<root level="INFO">
|
||||
<appender-ref ref="STDOUT"/>
|
||||
<appender-ref ref="ASYNC"/>
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user