diff --git a/docker/README.org b/docker/README.org new file mode 100644 index 0000000..eaca0d2 --- /dev/null +++ b/docker/README.org @@ -0,0 +1,16 @@ +#+title: docker 配置说明 + +每个及其需要用到的 docker 都通过 =docker-compose.yaml= 配置,避免每次升级都自己手动写命令行。 + +* 文件用途 + +| 文件 | 说明 | +|----------------------+--------------------------------| +| y480.yaml | 家用服务器 docker compose 配置 | +| xray-config.json | xray 服务器配置 | +| V2RayA-RoutingA.conf | V2rayA 路由配置 | + +* docker 镜像对应的 git 仓库 + +- https://github.com/ronggang/OWSS +- https://github.com/v2rayA/v2rayA diff --git a/V2RayA-RoutingA.conf b/docker/V2RayA-RoutingA.conf similarity index 100% rename from V2RayA-RoutingA.conf rename to docker/V2RayA-RoutingA.conf diff --git a/docker/xray-config.json b/docker/xray-config.json new file mode 100644 index 0000000..421dfac --- /dev/null +++ b/docker/xray-config.json @@ -0,0 +1,44 @@ +{ + "log": { + "loglevel": "warning", + "access": "/var/log/xray/access.log", + "error": "/var/log/xray/error.log" + }, + "inbounds": [ + { + "listen": "0.0.0.0", + "port": 443, + "protocol": "vless", + "settings": { + "clients": [ + { + "id": "817a867d-7bcf-48d1-b30e-5c6794852e13", + "flow": "xtls-rprx-vision" + } + ], + "decryption": "none", + "udp": true + }, + "streamSettings": { + "network": "tcp", + "security": "reality", + "realitySettings": { + "dest": "dl.google.com:443", + "serverNames": ["www.cloudflare.com"], + "privateKey": "uJQs7FOMjafiU-7kxOUpfJut8ocj5kpr_p-zH7RTt1g", + "shortIds": ["1e21014957dfc7a9"] + } + }, + "sniffing": { + "enabled": true, + "destOverride": ["http", "tls", "quic"] + } + } + ], + "outbounds": [ + { + "protocol": "freedom", + "tag": "direct" + } + ] +} diff --git a/docker/y480.yaml b/docker/y480.yaml new file mode 100644 index 0000000..0d89629 --- /dev/null +++ b/docker/y480.yaml @@ -0,0 +1,30 @@ +services: + owss: + image: ronggang/owss:latest + container_name: owss + restart: always + privileged: true + # host 模式和 bridge 模式二选一 + network_mode: host + # ports: + # - "8088:8088" + volumes: + - /OWSS/storage:/app/storage + - /OWSS/config:/app/config + + v2raya: + image: mzz2017/v2raya:latest + container_name: v2raya + restart: always + privileged: true + network_mode: host + volumes: + - /lib/modules:/lib/modules:ro + - /etc/resolv.conf:/etc/resolv.conf + - /etc/v2raya:/etc/v2raya + environment: + # V2RAYA_V2RAY_BIN: /usr/local/bin/v2ray # 老版本用这个,要开 xray 不设置这个环境变量 + # V2RAYA_V2RAY_BIN: /usr/bin/v2raya_core # 新版本用这个,或者不设置这个环境变量 + V2RAYA_LOG_FILE: /tmp/v2raya.log + V2RAYA_NFTABLES_SUPPORT: off + IPTABLES_MODE: legacy diff --git a/note/account.org.gpg b/note/account.org.gpg index 969a1fc..5f234c4 100644 Binary files a/note/account.org.gpg and b/note/account.org.gpg differ