Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit e6cb6cb

Browse files
tjx666tjx666
authored
🐛 fix: rename docker image and update docs for v2 (lobehub#11911)
1 parent 6d35558 commit e6cb6cb

File tree

83 files changed

+2967
-5028
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

83 files changed

+2967
-5028
lines changed

‎.github/ISSUE_TEMPLATE/1_bug_report.yml‎

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -47,17 +47,6 @@ body:
4747
validations:
4848
required: false
4949

50-
- type: dropdown
51-
attributes:
52-
label: '🔧 Deployment Mode'
53-
multiple: true
54-
options:
55-
- 'client db (lobe-chat image)'
56-
- 'client pgelite db (lobe-chat-pglite image)'
57-
- 'server db (lobe-chat-database image)'
58-
validations:
59-
required: true
60-
6150
- type: input
6251
attributes:
6352
label: '📌 Version'

‎README.md‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -479,13 +479,9 @@ Regardless of which database you choose, LobeHub can provide you with an excelle
479479

480480
### [Support Multi-User Management][docs-feat-auth]
481481

482-
LobeHub supports multi-user management and provides two main user authentication and management solutions to meet different needs:
482+
LobeHub supports multi-user management and provides flexible user authentication solutions:
483483

484-
- **next-auth**: LobeHub integrates `next-auth`, a flexible and powerful identity verification library that supports multiple authentication methods, including OAuth, email login, credential login, etc. With `next-auth`, you can easily implement user registration, login, session management, social login, and other functions to ensure the security and privacy of user data.
485-
486-
- [**Clerk**](https://go.clerk.com/exgqLG0): For users who need more advanced user management features, LobeHub also supports `Clerk`, a modern user management platform. `Clerk` provides richer functions, such as multi-factor authentication (MFA), user profile management, login activity monitoring, etc. With `Clerk`, you can get higher security and flexibility, and easily cope with complex user management needs.
487-
488-
Regardless of which user management solution you choose, LobeHub can provide you with an excellent user experience and powerful functional support.
484+
- **Better Auth**: LobeHub integrates `Better Auth`, a modern and flexible authentication library that supports multiple authentication methods, including OAuth, email login, credential login, magic links, and more. With `Better Auth`, you can easily implement user registration, login, session management, social login, multi-factor authentication (MFA), and other functions to ensure the security and privacy of user data.
489485

490486
<div align="right">
491487

@@ -845,12 +841,12 @@ This project is [LobeHub Community License](./LICENSE) licensed.
845841
[discord-link]: https://discord.gg/AYFPHvv2jT
846842
[discord-shield]: https://img.shields.io/discord/1127171173982154893?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square
847843
[discord-shield-badge]: https://img.shields.io/discord/1127171173982154893?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=for-the-badge
848-
[docker-pulls-link]: https://hub.docker.com/r/lobehub/lobe-chat-database
849-
[docker-pulls-shield]: https://img.shields.io/docker/pulls/lobehub/lobe-chat?color=45cc11&labelColor=black&style=flat-square&sort=semver
850-
[docker-release-link]: https://hub.docker.com/r/lobehub/lobe-chat-database
851-
[docker-release-shield]: https://img.shields.io/docker/v/lobehub/lobe-chat-database?color=369eff&label=docker&labelColor=black&logo=docker&logoColor=white&style=flat-square&sort=semver
852-
[docker-size-link]: https://hub.docker.com/r/lobehub/lobe-chat-database
853-
[docker-size-shield]: https://img.shields.io/docker/image-size/lobehub/lobe-chat-database?color=369eff&labelColor=black&style=flat-square&sort=semver
844+
[docker-pulls-link]: https://hub.docker.com/r/lobehub/lobehub
845+
[docker-pulls-shield]: https://img.shields.io/docker/pulls/lobehub/lobehub?color=45cc11&labelColor=black&style=flat-square&sort=semver
846+
[docker-release-link]: https://hub.docker.com/r/lobehub/lobehub
847+
[docker-release-shield]: https://img.shields.io/docker/v/lobehub/lobehub?color=369eff&label=docker&labelColor=black&logo=docker&logoColor=white&style=flat-square&sort=semver
848+
[docker-size-link]: https://hub.docker.com/r/lobehub/lobehub
849+
[docker-size-shield]: https://img.shields.io/docker/image-size/lobehub/lobehub?color=369eff&labelColor=black&style=flat-square&sort=semver
854850
[docs]: https://lobehub.com/docs/usage/start
855851
[docs-dev-guide]: https://lobehub.com/docs/development/start
856852
[docs-docker]: https://lobehub.com/docs/self-hosting/server-database/docker-compose

‎README.zh-CN.md‎

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -461,8 +461,6 @@ LobeHub 支持多用户管理，提供了灵活的用户认证方案：
461461

462462
- **Better Auth**：LobeHub 集成了 `Better Auth`，一个现代化且灵活的身份验证库，支持多种身份验证方式，包括 OAuth、邮件登录、凭证登录、魔法链接等。通过 `Better Auth`，您可以轻松实现用户的注册、登录、会话管理、社交登录、多因素认证 (MFA) 等功能，确保用户数据的安全性和隐私性。
463463

464-
- **next-auth**：LobeHub 还支持 `next-auth`，一个广泛使用的身份验证库，具有丰富的 OAuth 提供商支持和灵活的会话管理选项。
465-
466464
<div align="right">
467465

468466
[![][back-to-top]](#readme-top)
@@ -855,12 +853,12 @@ This project is [LobeHub Community License](./LICENSE) licensed.
855853
[discord-link]: https://discord.gg/AYFPHvv2jT
856854
[discord-shield]: https://img.shields.io/discord/1127171173982154893?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=flat-square
857855
[discord-shield-badge]: https://img.shields.io/discord/1127171173982154893?color=5865F2&label=discord&labelColor=black&logo=discord&logoColor=white&style=for-the-badge
858-
[docker-pulls-link]: https://hub.docker.com/r/lobehub/lobe-chat-database
859-
[docker-pulls-shield]: https://img.shields.io/docker/pulls/lobehub/lobe-chat?color=45cc11&labelColor=black&style=flat-square&sort=semver
860-
[docker-release-link]: https://hub.docker.com/r/lobehub/lobe-chat-database
861-
[docker-release-shield]: https://img.shields.io/docker/v/lobehub/lobe-chat-database?color=369eff&label=docker&labelColor=black&logo=docker&logoColor=white&style=flat-square&sort=semver
862-
[docker-size-link]: https://hub.docker.com/r/lobehub/lobe-chat-database
863-
[docker-size-shield]: https://img.shields.io/docker/image-size/lobehub/lobe-chat-database?color=369eff&labelColor=black&style=flat-square&sort=semver
856+
[docker-pulls-link]: https://hub.docker.com/r/lobehub/lobehub
857+
[docker-pulls-shield]: https://img.shields.io/docker/pulls/lobehub/lobehub?color=45cc11&labelColor=black&style=flat-square&sort=semver
858+
[docker-release-link]: https://hub.docker.com/r/lobehub/lobehub
859+
[docker-release-shield]: https://img.shields.io/docker/v/lobehub/lobehub?color=369eff&label=docker&labelColor=black&logo=docker&logoColor=white&style=flat-square&sort=semver
860+
[docker-size-link]: https://hub.docker.com/r/lobehub/lobehub
861+
[docker-size-shield]: https://img.shields.io/docker/image-size/lobehub/lobehub?color=369eff&labelColor=black&style=flat-square&sort=semver
864862
[docs]: https://lobehub.com/zh/docs/usage/start
865863
[docs-dev-guide]: https://lobehub.com/docs/development/start
866864
[docs-docker]: https://lobehub.com/zh/docs/self-hosting/server-database/docker-compose

‎apps/desktop/Development.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,7 @@ export default class AuthCtr extends ControllerModule {
181181

182182
2. **桌面端特定认证**：
183183
- 在桌面应用中使用固定的用户 ID
184-
- 支持与 Clerk 和 NextAuth 等认证系统集成
184+
- 支持与 Better Auth 认证系统集成
185185

186186
### 存储模块 (Store)
187187

‎docker-compose/local/docker-compose.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: lobe-chat-database
1+
name: lobehub
22
services:
33
network-service:
44
image: alpine
@@ -128,7 +128,7 @@ services:
128128

129129
lobe:
130130
image: lobehub/lobehub
131-
container_name: lobe-chat
131+
container_name: lobehub
132132
network_mode: 'service:network-service'
133133
depends_on:
134134
postgresql:

‎docker-compose/local/grafana/docker-compose.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: lobe-chat-database
1+
name: lobehub
22
services:
33
network-service:
44
image: alpine
@@ -159,8 +159,8 @@ services:
159159
- ENDPOINT=127.0.0.1:4317
160160

161161
lobe:
162-
image: lobehub/lobe-chat-database
163-
container_name: lobe-chat
162+
image: lobehub/lobehub
163+
container_name: lobehub
164164
network_mode: 'service:network-service'
165165
depends_on:
166166
postgresql:

‎docker-compose/local/logto/docker-compose.yml‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: lobe-chat-database
1+
name: lobehub
22
services:
33
network-service:
44
image: alpine
@@ -79,8 +79,8 @@ services:
7979
entrypoint: ['sh', '-c', 'npm run cli db seed -- --swe && npm start']
8080

8181
lobe:
82-
image: lobehub/lobe-chat-database
83-
container_name: lobe-chat
82+
image: lobehub/lobehub
83+
container_name: lobehub
8484
network_mode: 'service:network-service'
8585
depends_on:
8686
postgresql:
@@ -99,7 +99,6 @@ services:
9999
- 'AUTH_SSO_PROVIDERS=logto'
100100
- 'KEY_VAULTS_SECRET=Kix2wcUONd4CX51E/ZPAd36BqM4wzJgKjPtz2sGztqQ='
101101
- 'AUTH_SECRET=NX2kaPE923dt6BL2U8e9oSre5RfoT7hg'
102-
- 'NEXTAUTH_URL=http://localhost:${LOBE_PORT}/api/auth'
103102
- 'AUTH_LOGTO_ISSUER=http://localhost:${LOGTO_PORT}/oidc'
104103
- 'DATABASE_URL=postgresql://postgres:${POSTGRES_PASSWORD}@postgresql:5432/${LOBE_DB_NAME}'
105104
- 'S3_ENDPOINT=http://localhost:${MINIO_PORT}'

‎docker-compose/local/zitadel/.env.example‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# Required: LobeChat domain for tRPC calls
2-
# Ensure this domain is whitelisted in your NextAuth providers and S3 service CORS settings
2+
# Ensure this domain is whitelisted in your SSO providers and S3 service CORS settings
33
APP_URL=http://localhost:3210
44

55
# Postgres related environment variables
@@ -8,12 +8,11 @@ KEY_VAULTS_SECRET=Kix2wcUONd4CX51E/ZPAd36BqM4wzJgKjPtz2sGztqQ=
88
# Required: Postgres database connection string
99
DATABASE_URL=postgresql://postgres:uWNZugjBqixf8dxC@postgresql:5432/lobechat
1010

11-
# NEXT_AUTH related environment variables
12-
NEXTAUTH_URL=http://localhost:3210/api/auth
11+
# Authentication related environment variables
1312
AUTH_SECRET=NX2kaPE923dt6BL2U8e9oSre5RfoT7hg
1413
AUTH_SSO_PROVIDERS=zitadel
1514
# ZiTADEL provider configuration
16-
# Please refer to：https://lobehub.com/zh/docs/self-hosting/advanced/auth/next-auth/zitadel
15+
# Please refer to：https://lobehub.com/zh/docs/self-hosting/advanced/auth/providers/zitadel
1716
AUTH_ZITADEL_ID=285945938244075523
1817
AUTH_ZITADEL_SECRET=hkbtzHLaCEIeHeFThym14UcydpmQiEB5JtAX08HSqSoJxhAlVVkyovTuNUZ5TNrT
1918
AUTH_ZITADEL_ISSUER=http://localhost:8080

‎docker-compose/local/zitadel/.env.zh-CN.example‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,7 @@ KEY_VAULTS_SECRET=Kix2wcUONd4CX51E/ZPAd36BqM4wzJgKjPtz2sGztqQ=
77
# Postgres 数据库连接字符串
88
DATABASE_URL=postgresql://postgres:uWNZugjBqixf8dxC@postgresql:5432/lobechat
99

10-
# NEXT_AUTH 相关
11-
NEXTAUTH_URL=http://localhost:3210/api/auth
10+
# 鉴权相关
1211
AUTH_SECRET=NX2kaPE923dt6BL2U8e9oSre5RfoT7hg
1312
AUTH_SSO_PROVIDERS=zitadel
1413
# ZiTADEL 鉴权服务提供商部分

‎docker-compose/local/zitadel/docker-compose.yml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: lobe-chat-database
1+
name: lobehub
22
services:
33
network-service:
44
image: alpine
@@ -60,8 +60,8 @@ services:
6060
condition: service_healthy
6161

6262
lobe:
63-
image: lobehub/lobe-chat-database
64-
container_name: lobe-chat
63+
image: lobehub/lobehub
64+
container_name: lobehub
6565
network_mode: 'service:network-service'
6666
depends_on:
6767
postgresql:

0 commit comments

Comments
 (0)