From 7a90b30e7fb4e98ec13dc1f568a008b89a78925e Mon Sep 17 00:00:00 2001 From: jack ning Date: Thu, 17 Apr 2025 11:09:37 +0800 Subject: [PATCH] update --- deploy/docker/.env | 1 + deploy/docker/.env.example | 1 + deploy/docker/docker-compose.yaml | 3 --- deploy/docker/readme.md | 4 +++- deploy/docker/readme.zh.md | 4 +++- 5 files changed, 8 insertions(+), 5 deletions(-) create mode 100644 deploy/docker/.env create mode 100644 deploy/docker/.env.example diff --git a/deploy/docker/.env b/deploy/docker/.env new file mode 100644 index 0000000000..07db8840b1 --- /dev/null +++ b/deploy/docker/.env @@ -0,0 +1 @@ +MYSQL_ROOT_PASSWORD=r8FqfdbWUaN3 diff --git a/deploy/docker/.env.example b/deploy/docker/.env.example new file mode 100644 index 0000000000..07db8840b1 --- /dev/null +++ b/deploy/docker/.env.example @@ -0,0 +1 @@ +MYSQL_ROOT_PASSWORD=r8FqfdbWUaN3 diff --git a/deploy/docker/docker-compose.yaml b/deploy/docker/docker-compose.yaml index 5b03ca4033..56408c1d5b 100644 --- a/deploy/docker/docker-compose.yaml +++ b/deploy/docker/docker-compose.yaml @@ -269,9 +269,6 @@ services: # http://服务器ip:9003/doc.html KNIFE4J_ENABLED: true KNIFE4J_SETTING_LANGUAGE: zh_cn - # OpenTelemetry 配置 - # 禁用 OpenTelemetry 自动配置，解决启动错误 - OTEL_SDK_DISABLED: "true" # 增加数据库连接超时时间 SPRING_DATASOURCE_HIKARI_CONNECTION_TIMEOUT: 60000 SPRING_DATASOURCE_HIKARI_MAXIMUM_POOL_SIZE: 10 diff --git a/deploy/docker/readme.md b/deploy/docker/readme.md index 3e7ec70f21..bc3209e6bc 100644 --- a/deploy/docker/readme.md +++ b/deploy/docker/readme.md @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-03-12 10:21:18 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-01-19 09:59:46 + * @LastEditTime: 2025-04-17 11:08:00 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -21,6 +21,8 @@ git clone https://github.com/Bytedesk/bytedesk.git # enter docker directory cd bytedesk/deploy/docker +# configure environment variables, modify as needed +cp .env.example .env # start docker compose container, -f flag to specify file path, -d flag to start container in background mode docker compose -p bytedesk -f docker-compose.yaml up -d # with ollama diff --git a/deploy/docker/readme.zh.md b/deploy/docker/readme.zh.md index bb32a2077c..a7a310bc1a 100644 --- a/deploy/docker/readme.zh.md +++ b/deploy/docker/readme.zh.md @@ -2,7 +2,7 @@ * @Author: jackning 270580156@qq.com * @Date: 2024-03-12 10:21:18 * @LastEditors: jackning 270580156@qq.com - * @LastEditTime: 2025-04-17 10:41:39 + * @LastEditTime: 2025-04-17 10:52:25 * @Description: bytedesk.com https://github.com/Bytedesk/bytedesk * Please be aware of the BSL license restrictions before installing Bytedesk IM – * selling, reselling, or hosting Bytedesk IM as a service is a breach of the terms and automatically terminates your rights under the license. @@ -21,6 +21,8 @@ git clone https://github.com/Bytedesk/bytedesk.git # 进入docker目录 cd bytedesk/deploy/docker +# 配置环境变量，根据需要修改 +cp .env.example .env # 启动docker compose容器, -f标志来指定文件路径, -d标志表示在后台模式下启动容器 docker compose -p bytedesk -f docker-compose.yaml up -d # 内含ollama