From 63c70d4187c8dea0ad50427ed14ddb8df3c93b4f Mon Sep 17 00:00:00 2001 From: wangliang Date: Fri, 23 Oct 2026 11:52:32 +0800 Subject: [PATCH] chore: use Docker Hub images directly --- .env.example | 6 +++--- README.md | 2 +- docs/runbook.md | 2 +- libredesk/legacy/.env.example | 4 ++-- libredesk/legacy/README.standalone.md | 28 +++++++++++---------------- 5 files changed, 18 insertions(+), 24 deletions(-) diff --git a/.env.example b/.env.example index 2379eb1..2f30fdd 100644 --- a/.env.example +++ b/.env.example @@ -1,9 +1,9 @@ POSTGRES_USER= POSTGRES_PASSWORD= POSTGRES_DB= -POSTGRES_IMAGE= -REDIS_IMAGE= -LIBREDESK_IMAGE= +POSTGRES_IMAGE=pgvector/pgvector:pg18 +REDIS_IMAGE=redis:8.8-alpine +LIBREDESK_IMAGE=libredesk/libredesk:v2.9.0-rc.10 LIBREDESK_SYSTEM_USER_PASSWORD= LIBREDESK_ENC_KEY= LIBREDESK_BASE_URL= diff --git a/README.md b/README.md index 11d2a87..0e55381 100644 --- a/README.md +++ b/README.md @@ -219,7 +219,7 @@ cd bridge && npm test ## 关键约束 -- **本机无法直连 Docker Hub**：镜像走 `docker.1panel.live` 前缀（`.env` 已按此配置） +- **镜像直接使用 Docker Hub**：`libredesk/libredesk`、`pgvector/pgvector`、`redis`、`twentycrm/twenty`；如网络受限可在 Docker daemon 配自己的 registry mirror - **WhatsApp 仅 v2.9 RC 支持**，需要 Meta Cloud API 凭据；RC 版供联调，不直接上生产 - **LibreDesk AI 仍是 beta**，建议低流量验证 - 旧栈（Chatwoot/bridge/Twenty :3000）保持运行，可并行对照，互不影响 diff --git a/docs/runbook.md b/docs/runbook.md index 4949ddd..43ea4b2 100644 --- a/docs/runbook.md +++ b/docs/runbook.md @@ -171,7 +171,7 @@ docker compose logs --tail=50 libredesk ```bash # 切回稳定版 -sed -i 's#^LIBREDESK_IMAGE=.*#LIBREDESK_IMAGE=docker.1panel.live/libredesk/libredesk:latest#' .env +sed -i 's#^LIBREDESK_IMAGE=.*#LIBREDESK_IMAGE=libredesk/libredesk:latest#' .env docker compose up -d --force-recreate libredesk # 跨大版本回滚数据库需恢复备份（升级前 pg_dump） ``` diff --git a/libredesk/legacy/.env.example b/libredesk/legacy/.env.example index 6eef6f3..07729f5 100644 --- a/libredesk/legacy/.env.example +++ b/libredesk/legacy/.env.example @@ -7,10 +7,10 @@ # 稳定版（v2.8.x，无 WhatsApp） LIBREDESK_IMAGE=libredesk/libredesk:latest # 当前使用 v2.9 预发布版（含 WhatsApp；稳定版 latest = v2.8.0 无 WhatsApp） -# LIBREDESK_IMAGE=docker.1panel.live/libredesk/libredesk:v2.9.0-rc.10 +# LIBREDESK_IMAGE=libredesk/libredesk:v2.9.0-rc.10 # 本机无法直连 Docker Hub 时，用镜像源前缀或本地已有镜像覆盖： -# 回滚稳定版：LIBREDESK_IMAGE=docker.1panel.live/libredesk/libredesk:latest +# 回滚稳定版：LIBREDESK_IMAGE=libredesk/libredesk:latest # POSTGRES_IMAGE=pgvector/pgvector:pg18 # REDIS_IMAGE=redis:8.8-alpine diff --git a/libredesk/legacy/README.standalone.md b/libredesk/legacy/README.standalone.md index aaecd68..46af361 100644 --- a/libredesk/legacy/README.standalone.md +++ b/libredesk/legacy/README.standalone.md @@ -70,10 +70,9 @@ crm-new/libredesk/ ## 快速开始 -> 网络提示：本机直连 Docker Hub 会 reset。`.env` 已默认复用本地已有镜像 -> （`pgvector/pgvector:pg18`、`redis:8.8-alpine`），LibreDesk 镜像可用时可改 -> `LIBREDESK_IMAGE=docker.1panel.live/libredesk/libredesk:latest` 等镜像源。 -> 详见文末「镜像拉取」一节。 +> 网络提示：本机可直连 Docker Hub。镜像直接使用 `libredesk/libredesk`、 +> `pgvector/pgvector`、`redis`、`twentycrm/twenty`；如网络受限可在 Docker daemon +> 配 registry mirror。详见文末「镜像拉取」一节。 ```bash cd /home/dev/code/crm-new/libredesk @@ -125,29 +124,24 @@ cd services/tools && npm test - 未接入观测/评估/飞轮（需要时按 [docs/migration-plan.md](docs/migration-plan.md) 的 L6 保留 bridge） - WhatsApp 需 v2.9 预发布版（见 setup 文档最后一节） -## 镜像拉取（国内网络） +## 镜像拉取 -本机实测：`registry-1.docker.io` 连接被 reset，直连不可用。 +本机可直连 Docker Hub，直接拉取： -| 方案 | 命令 | 备注 | -|---|---|---| -| 1panel 镜像源 | `docker pull docker.1panel.live/libredesk/libredesk:v2.9.0-rc.10` | ✅ 2026-10-21 实测可用（74MB） | -| 稳定版 latest | `docker pull docker.1panel.live/libredesk/libredesk:latest` | ✅ 可用（= v2.8.0，无 WhatsApp） | -| 1ms 镜像源 | `docker pull docker.1ms.run/libredesk/libredesk:latest` | 备用 | -| 自建（不推荐） | 从 `v2.8.0` 源码构建 | 需要 Go + Node + pnpm，耗时较长 | +```bash +docker pull libredesk/libredesk:v2.9.0-rc.10 +``` -拉到镜像后改 `.env`： +`.env`： ```ini -LIBREDESK_IMAGE=docker.1panel.live/libredesk/libredesk:v2.9.0-rc.10 -# 或本地打 tag 后继续用默认值 -# docker tag docker.1panel.live/libredesk/libredesk:v2.9.0-rc.10 libredesk/libredesk:v2.9.0-rc.10 +LIBREDESK_IMAGE=libredesk/libredesk:v2.9.0-rc.10 ``` ### 回滚到稳定版 v2.8.0 ```bash -sed -i 's#^LIBREDESK_IMAGE=.*#LIBREDESK_IMAGE=docker.1panel.live/libredesk/libredesk:latest#' .env +sed -i 's#^LIBREDESK_IMAGE=.*#LIBREDESK_IMAGE=libredesk/libredesk:latest#' .env docker compose up -d --force-recreate app # 跨版本回退需用备份库，见下 ```