🐛 fix: support `PROXY_URL` in docker with proxychains-ng #3362

hezhijie0327 · 2024-07-29T07:21:40Z

💻 变更类型 | Change Type

🔀 变更说明 | Description of Change

以 Xray 的 Socks5 为例，配置 PROXY_URL="socks5://127.0.0.1:7891"
增加 Alpine Package Mirror，加速构建 [TODO: 镜像源当前为 USTC，是否有必要改为其他？]
重命名 USE_NPM_CN_MIRROR 为 USE_CN_MIRROR

📝 补充信息 | Additional Information

replace: #2382

vercel · 2024-07-29T07:21:44Z

@hezhijie0327 is attempting to deploy a commit to the LobeHub Pro Team on Vercel.

A member of the Team first needs to authorize it.

lobehubbot · 2024-07-29T07:21:53Z

👍 @hezhijie0327

Thank you for raising your pull request and contributing to our Community
Please make sure you have followed our contributing guidelines. We will review it as soon as possible.
If you encounter any problems, please feel free to connect with us.
非常感谢您提出拉取请求并为我们的社区做出贡献，请确保您已经遵循了我们的贡献指南，我们会尽快审查它。
如果您遇到任何问题，请随时与我们联系。

codecov · 2024-07-29T08:03:45Z

Codecov Report

All modified and coverable lines are covered by tests ✅

Additional details and impacted files

@@            Coverage Diff             @@
##             main    #3362      +/-   ##
==========================================
- Coverage   94.24%   94.21%   -0.03%     
==========================================
  Files         400      403       +3     
  Lines       25148    25657     +509     
  Branches     1839     1881      +42     
==========================================
+ Hits        23700    24174     +474     
- Misses       1448     1483      +35

Flag	Coverage Δ
app	`94.21% <ø> (-0.03%)`	⬇️
server	`70.69% <ø> (+1.59%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

hezhijie0327 · 2024-07-29T08:41:08Z

TODO:

加入 nslookup localhost | grep 'Address:' | tail -n 1 | awk 'print $2' 支持域名格式服务器解析
~~A 及 AAAA 记录，-q=A 或 -q=AAAA~~ proxychains 仅支持 v4 地址，固定解析 A 地址
当解析结果为空时，返回输入值

dns_record=$(nslookup ${host%%:*} | grep 'Address:' | tail -n 1 | awk 'print $2')

"$protocol ${dns_record:-${host%%:*}} $port"

lobehubbot · 2024-07-29T08:41:19Z

TODO:

Add nslookup localhost | grep 'Address:' | tail -n 1 | awk 'print $2' to support domain name format server resolution
A and AAAA records, -q=A or -q=AAAA
When the parsing result is empty, return the input value

hezhijie0327 · 2024-07-29T11:32:16Z

@arvinxx 代理功能都实现了，可以试试

构建:
docker build -t lobe-chat:local --build-arg USE_CN_MIRROR=true --no-cache .

代理：
docker run -it --rm -p 3210:3210 -e PROXY_URL="socks5://127.0.0.1:7891" lobe-chat:local

代理带域名：
docker run -it --rm -p 3210:3210 -e PROXY_URL="socks5://localhost:7891" lobe-chat:local

arvinxx · 2024-07-30T02:01:11Z

@hezhijie0327 必须要带 USE_CN_MIRROR 才能打出 PROXY_URL 的版本吗？

lobehubbot · 2024-07-30T02:01:23Z

@hezhijie0327 Is it necessary to bring USE_CN_MIRROR to print the PROXY_URL version?

arvinxx · 2024-07-30T02:02:28Z

哦看了下，直接配 PROXY_URL 就行

lobehubbot · 2024-07-30T02:02:40Z

Oh, after taking a look, just configure PROXY_URL.

hezhijie0327 · 2024-07-30T02:42:23Z

嗯 USE_CN_MIRROR 这个仅在镜像构建中用到，主要是 Alpine 也需要镜像干脆就统一一个变量了

lobehubbot · 2024-07-30T02:42:39Z

Well, USE_CN_MIRROR is only used in image construction. Mainly because Alpine also needs images, so just unify one variable.

yexingok · 2024-08-01T09:59:33Z

感谢作者，请问这个功能啥时候回合并到主线？
sock5代理恰好是一个需要的功能

lobehubbot · 2024-08-01T09:59:44Z

Thanks to the author, when will this feature be merged into the mainline?
sock5 proxy is exactly a needed feature

…set default model

arvinxx · 2024-08-02T14:25:22Z

@hezhijie0327 我测下来似乎不行？我用的代理是 ClashX

hezhijie0327 · 2024-08-02T22:27:01Z

@arvinxx 是 Docker Desktop 嘛?

如果是的话，建议用当前计算机的实际 IP 地址（192.168.0.x）或容器的 Host IP，并开启局域网访问（可能是叫这个名字，类似这种功能，需要将服务绑定在 0.0.0.0/0 上）实测下来只需要使用 host.docker.internal 即可

Docker Desktop 在 Windows 和 macOS 上走的是虚拟机方案，如果是 localhost 的话是走到 lobe-chat 自身容器的 localhost

lobehubbot · 2024-08-02T22:27:14Z

@arvinxx Is it Docker Desktop?

If so, it is recommended to use the actual IP address of the current computer (192.168.0.x) or the Host IP of the container, and enable LAN access (it may be called this name. For similar functions, the service needs to be bound to 0.0.0.0 /0 on)

Docker Desktop uses a virtual machine solution on Windows and macOS. If it is localhost, it goes to localhost of the lobe-chat own container.

hezhijie0327 · 2024-08-02T22:59:43Z

尝试用 host.docker.internal 替代 localhost

docker run -it --rm -p 3210:3210 -e PROXY_URL="socks5://host.docker.internal:7890" lobe-chat:local

lobehubbot · 2024-08-02T22:59:56Z

尝试用 host.docker.internal 替代 localhost

docker run -it --rm -p 3210:3210 -e PROXY_URL="socks5://host.docker.internal:7890" lobe-chat:local

arvinxx · 2024-08-03T11:15:16Z

测下来没问题了，hezhijie0327#43 补了下文档

lobehubbot · 2024-08-03T11:15:28Z

There is no problem after testing, hezhijie0327#43 added the documentation

Related to lobehub#2004 Add documentation for `PROXY_URL` environment variable in both English and Chinese versions of the environment variables guide. * **English Documentation** - Add `PROXY_URL` section to specify the proxy URL for connecting to external services. - Include example values and a callout for Docker Desktop users. * **Chinese Documentation** - Add `PROXY_URL` section to specify the proxy URL for connecting to external services. - Include example values and a callout for Docker Desktop users. --- For more details, open the [Copilot Workspace session](https://copilot-workspace.githubnext.com/lobehub/lobe-chat/pull/3362?shareId=XXXX-XXXX-XXXX-XXXX).

hezhijie0327 · 2024-08-03T11:21:00Z

好的，merge 了

lobehubbot · 2024-08-03T11:21:13Z

OK, merge

lobehubbot · 2024-08-03T11:35:23Z

❤️ Great PR @hezhijie0327 ❤️

The growth of project is inseparable from user feedback and contribution, thanks for your contribution! If you are interesting with the lobehub developer community, please join our discord and then dm @arvinxx or @canisminor1990. They will invite you to our private developer channel. We are talking about the lobe-chat development or sharing ai newsletter around the world.
项目的成长离不开用户反馈和贡献，感谢您的贡献! 如果您对 LobeHub 开发者社区感兴趣，请加入我们的 discord，然后私信 @arvinxx 或 @canisminor1990。他们会邀请您加入我们的私密开发者频道。我们将会讨论关于 Lobe Chat 的开发，分享和讨论全球范围内的 AI 消息。

### [Version 1.8.2](v1.8.1...v1.8.2) <sup>Released on **2024-08-03**</sup> #### 🐛 Bug Fixes - **misc**: Add `PROXY_URL` in docker with proxychains-ng. <br/> <details> <summary><kbd>Improvements and Fixes</kbd></summary> #### What's fixed * **misc**: Add `PROXY_URL` in docker with proxychains-ng, closes [#3362](#3362) ([920de7c](920de7c)) </details> <div align="right"> [![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top) </div>

lobehubbot · 2024-08-03T11:41:08Z

🎉 This PR is included in version 1.8.2 🎉

The release is available on:

Your semantic-release bot 📦🚀

### [Version 1.51.1](v1.51.0...v1.51.1) <sup>Released on **2024-08-03**</sup> #### 🐛 Bug Fixes - **misc**: Add `PROXY_URL` in docker with proxychains-ng. #### 💄 Styles - **misc**: Fix `aya`, `mathstral` model tag icon & update ollama model info. <br/> <details> <summary><kbd>Improvements and Fixes</kbd></summary> #### What's fixed * **misc**: Add `PROXY_URL` in docker with proxychains-ng, closes [lobehub#3362](https://github.com/bentwnghk/lobe-chat/issues/3362) ([920de7c](920de7c)) #### Styles * **misc**: Fix `aya`, `mathstral` model tag icon & update ollama model info, closes [lobehub#3382](https://github.com/bentwnghk/lobe-chat/issues/3382) ([ced95a8](ced95a8)) </details> <div align="right"> [![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top) </div>

* ✨: feat: support PROXY_URL in docker with proxychains-ng * 🔨 chore: let proxychains config more readable * 🔨 chore: add package update * ⚡️ perf: add CN mirror for Alpine * 🔨 chore: add more comments * 🔨 chore: change USE_NPM_CN_MIRROR to USE_CN_MIRROR * 🐛 fix: fix cn mirror for alpine during building * 🐛 fix: fix permission issue * 🐛 fix: fix app path error * ✨ feat: support proxy server with domain * 🔨 chore: add more comments & cleanup code * 🔨 chore: add more comments * ⚡️ perf: resolve only when host is domain * 🔨 chore: move IP_REGEX to head * 🔨 chore: replace `! -z` to `-n` * 🔨 chore: update comments * ✨ feat: add `DEFAULT_AGENT_CONFIG` and `SYSTEM_AGENT` to env, allow set default model * Add documentation for `PROXY_URL` environment variable Add documentation for `PROXY_URL` environment variable in both English and Chinese versions of the environment variables guide. * **English Documentation** - Add `PROXY_URL` section to specify the proxy URL for connecting to external services. - Include example values and a callout for Docker Desktop users. * **Chinese Documentation** - Add `PROXY_URL` section to specify the proxy URL for connecting to external services. - Include example values and a callout for Docker Desktop users. --------- Co-authored-by: Arvin Xu <[email protected]>

### [Version 1.8.2](lobehub/lobe-chat@v1.8.1...v1.8.2) <sup>Released on **2024-08-03**</sup> #### 🐛 Bug Fixes - **misc**: Add `PROXY_URL` in docker with proxychains-ng. <br/> <details> <summary><kbd>Improvements and Fixes</kbd></summary> #### What's fixed * **misc**: Add `PROXY_URL` in docker with proxychains-ng, closes [lobehub#3362](lobehub#3362) ([920de7c](lobehub@920de7c)) </details> <div align="right"> [![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top) </div>

* ✨: feat: support PROXY_URL in docker with proxychains-ng * 🔨 chore: let proxychains config more readable * 🔨 chore: add package update * ⚡️ perf: add CN mirror for Alpine * 🔨 chore: add more comments * 🔨 chore: change USE_NPM_CN_MIRROR to USE_CN_MIRROR * 🐛 fix: fix cn mirror for alpine during building * 🐛 fix: fix permission issue * 🐛 fix: fix app path error * ✨ feat: support proxy server with domain * 🔨 chore: add more comments & cleanup code * 🔨 chore: add more comments * ⚡️ perf: resolve only when host is domain * 🔨 chore: move IP_REGEX to head * 🔨 chore: replace `! -z` to `-n` * 🔨 chore: update comments * ✨ feat: add `DEFAULT_AGENT_CONFIG` and `SYSTEM_AGENT` to env, allow set default model * Add documentation for `PROXY_URL` environment variable Add documentation for `PROXY_URL` environment variable in both English and Chinese versions of the environment variables guide. * **English Documentation** - Add `PROXY_URL` section to specify the proxy URL for connecting to external services. - Include example values and a callout for Docker Desktop users. * **Chinese Documentation** - Add `PROXY_URL` section to specify the proxy URL for connecting to external services. - Include example values and a callout for Docker Desktop users. --------- Co-authored-by: Arvin Xu <[email protected]>

### [Version 1.8.2](lobehub/lobe-chat@v1.8.1...v1.8.2) <sup>Released on **2024-08-03**</sup> #### 🐛 Bug Fixes - **misc**: Add `PROXY_URL` in docker with proxychains-ng. <br/> <details> <summary><kbd>Improvements and Fixes</kbd></summary> #### What's fixed * **misc**: Add `PROXY_URL` in docker with proxychains-ng, closes [lobehub#3362](lobehub#3362) ([920de7c](lobehub@920de7c)) </details> <div align="right"> [![](https://img.shields.io/badge/-BACK_TO_TOP-151515?style=flat-square)](#readme-top) </div>

hezhijie0327 added 6 commits July 29, 2024 13:38

✨: feat: support PROXY_URL in docker with proxychains-ng

157fac0

🔨 chore: let proxychains config more readable

34d109c

🔨 chore: add package update

1f099a6

⚡️ perf: add CN mirror for Alpine

d8b2ae3

🔨 chore: add more comments

8969a8d

🔨 chore: change USE_NPM_CN_MIRROR to USE_CN_MIRROR

3cdec08

hezhijie0327 mentioned this pull request Jul 29, 2024

✨: build: support PROXY_URL in docker #2382

Closed

7 tasks

hezhijie0327 changed the base branch from build/docker-proxy to main July 29, 2024 07:29

🐛 fix: fix cn mirror for alpine during building

2cf39b9

hezhijie0327 added 2 commits July 29, 2024 16:13

🐛 fix: fix permission issue

d1e2088

🐛 fix: fix app path error

6ab167d

hezhijie0327 added 3 commits July 29, 2024 19:08

✨ feat: support proxy server with domain

66988c4

🔨 chore: add more comments & cleanup code

4cf1cb5

🔨 chore: add more comments

2f49a95

hezhijie0327 added 2 commits July 30, 2024 07:53

⚡️ perf: resolve only when host is domain

c79c72f

🔨 chore: move IP_REGEX to head

4ceac4d

arvinxx changed the title ~~✨ feat: support PROXY_URL in docker with proxychains-ng~~ ✨ feat: support PROXY_URL in docker with proxychains-ng Jul 30, 2024

🔨 chore: replace ! -z to -n

b0a1af1

🔨 chore: update comments

d5dac5b

✨ feat: add DEFAULT_AGENT_CONFIG and SYSTEM_AGENT to env, allow …

a48f693

…set default model

arvinxx mentioned this pull request Aug 3, 2024

Add documentation for PROXY_URL environment variable hezhijie0327/lobe-chat#43

Merged

arvinxx changed the title ~~✨ feat: support PROXY_URL in docker with proxychains-ng~~ 🐛 fix: support PROXY_URL in docker with proxychains-ng Aug 3, 2024

arvinxx merged commit 920de7c into lobehub:main Aug 3, 2024
4 of 7 checks passed

lobehubbot added the released label Aug 3, 2024

hezhijie0327 deleted the proxy branch August 3, 2024 11:49

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

🐛 fix: support `PROXY_URL` in docker with proxychains-ng #3362

🐛 fix: support `PROXY_URL` in docker with proxychains-ng #3362

hezhijie0327 commented Jul 29, 2024 •

edited by arvinxx

Loading

vercel bot commented Jul 29, 2024

lobehubbot commented Jul 29, 2024

codecov bot commented Jul 29, 2024 •

edited

Loading

hezhijie0327 commented Jul 29, 2024 •

edited

Loading

lobehubbot commented Jul 29, 2024

hezhijie0327 commented Jul 29, 2024

arvinxx commented Jul 30, 2024

lobehubbot commented Jul 30, 2024

arvinxx commented Jul 30, 2024

lobehubbot commented Jul 30, 2024

hezhijie0327 commented Jul 30, 2024

lobehubbot commented Jul 30, 2024

yexingok commented Aug 1, 2024

lobehubbot commented Aug 1, 2024

arvinxx commented Aug 2, 2024

hezhijie0327 commented Aug 2, 2024 •

edited

Loading

lobehubbot commented Aug 2, 2024

hezhijie0327 commented Aug 2, 2024 •

edited

Loading

lobehubbot commented Aug 2, 2024

arvinxx commented Aug 3, 2024

lobehubbot commented Aug 3, 2024

hezhijie0327 commented Aug 3, 2024

lobehubbot commented Aug 3, 2024

lobehubbot commented Aug 3, 2024

lobehubbot commented Aug 3, 2024

🐛 fix: support PROXY_URL in docker with proxychains-ng #3362

🐛 fix: support PROXY_URL in docker with proxychains-ng #3362

Conversation

hezhijie0327 commented Jul 29, 2024 • edited by arvinxx Loading

💻 变更类型 | Change Type

🔀 变更说明 | Description of Change

📝 补充信息 | Additional Information

vercel bot commented Jul 29, 2024

lobehubbot commented Jul 29, 2024

codecov bot commented Jul 29, 2024 • edited Loading

Codecov Report

hezhijie0327 commented Jul 29, 2024 • edited Loading

lobehubbot commented Jul 29, 2024

hezhijie0327 commented Jul 29, 2024

arvinxx commented Jul 30, 2024

lobehubbot commented Jul 30, 2024

arvinxx commented Jul 30, 2024

lobehubbot commented Jul 30, 2024

hezhijie0327 commented Jul 30, 2024

lobehubbot commented Jul 30, 2024

yexingok commented Aug 1, 2024

lobehubbot commented Aug 1, 2024

arvinxx commented Aug 2, 2024

hezhijie0327 commented Aug 2, 2024 • edited Loading

lobehubbot commented Aug 2, 2024

hezhijie0327 commented Aug 2, 2024 • edited Loading

lobehubbot commented Aug 2, 2024

arvinxx commented Aug 3, 2024

lobehubbot commented Aug 3, 2024

hezhijie0327 commented Aug 3, 2024

lobehubbot commented Aug 3, 2024

lobehubbot commented Aug 3, 2024

lobehubbot commented Aug 3, 2024

🐛 fix: support `PROXY_URL` in docker with proxychains-ng #3362

🐛 fix: support `PROXY_URL` in docker with proxychains-ng #3362

hezhijie0327 commented Jul 29, 2024 •

edited by arvinxx

Loading

codecov bot commented Jul 29, 2024 •

edited

Loading

hezhijie0327 commented Jul 29, 2024 •

edited

Loading

hezhijie0327 commented Aug 2, 2024 •

edited

Loading

hezhijie0327 commented Aug 2, 2024 •

edited

Loading