fix: 落盘 docker-compose.yml 并对齐 run/compose 部署参数(代理+add-host+NO_PROXY)
- README 声称的 compose 文件此前不存在,容器恢复全靠 inspect 复制 - 补齐 HTTPS_PROXY/NO_PROXY/--add-host/NET_ADMIN/DEFAULT_HOST_ROOT 实际参数 - BBC RSS 等境外源必须走宿主代理,否则 Network unreachable
This commit is contained in:
1 parent
66966f6990
commit
6cae4e9cf9
2 files changed
+61
-17
No files matched your search
@@ -53,14 +53,25 @@ EOF
|
||||
```bash
|
||||
docker build -t it-tools-relay .
|
||||
docker run -d --name it-tools-relay --restart always \
|
||||
-p 8091:8091 --env-file .env \
|
||||
-v relay-data:/app/data \
|
||||
--network ittools-net -p 8091:8091 --env-file .env \
|
||||
-e DEFAULT_HOST_ROOT=/vol3/1000/HD3/docker/it-tools-relay/data \
|
||||
-e HTTPS_PROXY=http://host.docker.internal:7890 \
|
||||
-e HTTP_PROXY=http://host.docker.internal:7890 \
|
||||
-e NO_PROXY=localhost,127.0.0.1,192.168.68.19 \
|
||||
--add-host host.docker.internal:host-gateway \
|
||||
--cap-add NET_ADMIN \
|
||||
-v /vol3/1000/HD3/docker/it-tools-relay/data:/app/data \
|
||||
it-tools-relay
|
||||
```
|
||||
|
||||
已有镜像时可省去构建:`docker run ... 192.168.68.19:3200/jinghui/it-tools-relay:latest`。
|
||||
|
||||
数据(试用记录、用量库、用户库)持久化在卷 `relay-data:/app/data`。要被 IT-Tools 的 nginx 按容器名反代,需加 `--network ittools-net`(`docker network create ittools-net`)。
|
||||
数据(试用记录、用量库、用户库、news.json)持久化在目录 `data/`。要被 IT-Tools 的 nginx 按容器名反代,需加 `--network ittools-net`(`docker network create ittools-net`)。
|
||||
|
||||
注意事项(缺一不可):
|
||||
- `--add-host host.docker.internal:host-gateway` 必须有,代理与宿主服务访问依赖该解析,缺失时境外 RSS 抓取报 `Network unreachable`;
|
||||
- `HTTPS_PROXY/HTTP_PROXY` 指向宿主 Mihomo(BBC 等境外源直连不可达),`NO_PROXY` 必须包含内网地址(NewAPI/OCR/授权中心),否则内网请求被绕进代理;
|
||||
- 国际新闻走代理抓取,改动代理配置后删除 `data/news.json` 再访问一次 `/news` 即可强制重抓。
|
||||
|
||||
## 方式二:Docker Compose 部署
|
||||
|
||||
@@ -69,7 +80,6 @@ docker run -d --name it-tools-relay --restart always \
|
||||
```yaml
|
||||
services:
|
||||
it-tools-relay:
|
||||
build: .
|
||||
image: 192.168.68.19:3200/jinghui/it-tools-relay:latest
|
||||
container_name: it-tools-relay
|
||||
restart: always
|
||||
@@ -78,27 +88,28 @@ services:
|
||||
env_file:
|
||||
- .env
|
||||
environment:
|
||||
# 常用项也可直接写在这里,优先级高于 .env
|
||||
- RELAY_TIMEOUT=25
|
||||
- MAX_UPLOAD_MB=50
|
||||
- HF_HOME=/root/.cache/huggingface
|
||||
# 宿主数据目录(/hostfs、宿主路径访问类接口用)
|
||||
- DEFAULT_HOST_ROOT=/vol3/1000/HD3/docker/it-tools-relay/data
|
||||
# 容器出网走宿主 Mihomo 代理(BBC RSS 等境外源直连不可达)
|
||||
- HTTPS_PROXY=http://host.docker.internal:7890
|
||||
- HTTP_PROXY=http://host.docker.internal:7890
|
||||
# 内网服务(NewAPI/OCR/授权中心)直连,不走代理
|
||||
- NO_PROXY=localhost,127.0.0.1,192.168.68.19
|
||||
volumes:
|
||||
# 试用记录 / 用量库 / 用户库 持久化
|
||||
- relay-data:/app/data
|
||||
# 可选:代理宿主机目录,供 /hostfs、文件转换类接口使用
|
||||
# - ./data:/app/data
|
||||
# 数据持久化:试用记录 / 用量库 / 用户库 / news.json
|
||||
- ./data:/app/data
|
||||
cap_add:
|
||||
- NET_ADMIN
|
||||
extra_hosts:
|
||||
# 容器内访问宿机代理 / 服务时用 host.docker.internal
|
||||
# 缺失会导致境外 RSS 抓取 Network unreachable
|
||||
- "host.docker.internal:host-gateway"
|
||||
networks:
|
||||
- ittools-net
|
||||
|
||||
volumes:
|
||||
relay-data:
|
||||
|
||||
networks:
|
||||
# 接入既有 ittools-net 供 it-tools nginx 反代;external=true 防止重建同名网络
|
||||
ittools-net:
|
||||
driver: bridge
|
||||
external: true
|
||||
```
|
||||
|
||||
```bash
|
||||
|
||||
@@ -0,0 +1,33 @@
|
||||
services:
|
||||
it-tools-relay:
|
||||
image: 192.168.68.19:3200/jinghui/it-tools-relay:latest
|
||||
container_name: it-tools-relay
|
||||
restart: always
|
||||
ports:
|
||||
- "8091:8091"
|
||||
env_file:
|
||||
- .env
|
||||
environment:
|
||||
# 宿主数据目录(/hostfs、宿主路径访问类接口用)
|
||||
- DEFAULT_HOST_ROOT=/vol3/1000/HD3/docker/it-tools-relay/data
|
||||
# 容器出网走宿主 Mihomo 代理(BBC RSS 等境外源直连不可达,必须走代理)
|
||||
- HTTPS_PROXY=http://host.docker.internal:7890
|
||||
- HTTP_PROXY=http://host.docker.internal:7890
|
||||
# 内网服务(NewAPI/OCR/授权中心)直连,不走代理
|
||||
- NO_PROXY=localhost,127.0.0.1,192.168.68.19
|
||||
volumes:
|
||||
# 数据持久化:试用记录 / 用量库 / 用户库 / news.json
|
||||
- ./data:/app/data
|
||||
cap_add:
|
||||
- NET_ADMIN
|
||||
extra_hosts:
|
||||
# 代理/宿主服务访问依赖此解析(缺失会导致出网 Network unreachable)
|
||||
- "host.docker.internal:host-gateway"
|
||||
networks:
|
||||
- ittools-net
|
||||
|
||||
networks:
|
||||
# 必须接入既有 ittools-net,供 it-tools 的 nginx 按容器名反代;
|
||||
# 已存在则必须 external=true,否则 compose 会重建同名网络导致孤立
|
||||
ittools-net:
|
||||
external: true
|
||||
Reference in new issue
Block a user