From 43603b8f50d4526fc226e41eff555ddcb84d7d6e Mon Sep 17 00:00:00 2001 From: Zedhugh Chen Date: Sat, 29 Aug 2026 05:42:55 +0800 Subject: [PATCH] =?UTF-8?q?docker:=20=E9=87=8D=E6=96=B0=E7=BB=84=E7=BB=87?= =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E9=85=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 用功能更强大的 WebDAV 代替掉 OWSS - WebDAV 和 v2raya 服务都拆成单独的配置文件 --- docker/{y480.yaml => v2raya.yaml} | 13 ----------- docker/webdav-config.yaml | 36 ++++++++++++++++++++++++++++++ docker/webdav.yaml | 36 ++++++++++++++++++++++++++++++ note/account.org.gpg | Bin 4934 -> 5009 bytes 4 files changed, 72 insertions(+), 13 deletions(-) rename docker/{y480.yaml => v2raya.yaml} (67%) create mode 100644 docker/webdav-config.yaml create mode 100644 docker/webdav.yaml diff --git a/docker/y480.yaml b/docker/v2raya.yaml similarity index 67% rename from docker/y480.yaml rename to docker/v2raya.yaml index 0d89629..6f94529 100644 --- a/docker/y480.yaml +++ b/docker/v2raya.yaml @@ -1,17 +1,4 @@ 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 diff --git a/docker/webdav-config.yaml b/docker/webdav-config.yaml new file mode 100644 index 0000000..a8059b3 --- /dev/null +++ b/docker/webdav-config.yaml @@ -0,0 +1,36 @@ +address: 0.0.0.0 +port: 46065 +auth: true +prefix: / +tls: false +behindProxy: true +log: + format: console + colors: true + outputs: + - /logs/webdav.log +logLevel: info + +directory: /data +permissions: R + +users: + - username: zedhugh + password: "{bcrypt}$2a$10$nP6GQJidzLyhwkkQGQH/KOAQq2KjNW5Fbb.I/XD2OD2oxCxEoXbUO" + directory: /data + permissions: CRUD + + - username: PT + password: "{bcrypt}$2a$10$cK9NWvSafxne2Fv6P6ZH7.Q/tVKk5M4pqXgsuOi2bF/zsCopFHsC2" + directory: /data/users/PT + permissions: CRUD + + - username: v2rayNG + password: "{bcrypt}$2a$10$jvjejyOea8Xqsik8a9M71.rvC/0kdFah2WuMCTKHBQJ8PxGkdFmKC" + directory: /data/users/v2rayNG + permissions: CRUD + + - username: guest + password: "guest" + directory: /data/public + permissions: R diff --git a/docker/webdav.yaml b/docker/webdav.yaml new file mode 100644 index 0000000..dee4c86 --- /dev/null +++ b/docker/webdav.yaml @@ -0,0 +1,36 @@ +x-data-volume: &data-volume + type: bind + source: /var/db/webDAV + target: /data + +x-user-dirs: &user-dirs + /data/users/PT + /data/users/v2rayNG + /data/public + +services: + WebDAV-init: + image: busybox:latest + container_name: webdav-init + restart: no + volumes: + - *data-volume + environment: + DIRS: *user-dirs + command: sh -c "mkdir -p $$DIRS" + + WebDAV: + image: hacdias/webdav:latest + container_name: webdav + restart: always + depends_on: + WebDAV-init: + condition: service_completed_successfully + command: ["-c", "/config.yaml"] + network_mode: host + volumes: + - ./webdav-config.yaml:/config.yaml:ro + - /var/log:/logs + - *data-volume + environment: + TZ: Asia/Shanghai diff --git a/note/account.org.gpg b/note/account.org.gpg index 5f234c41048d5253b73ed3b12696ce3ba8d961fc..16d9869023be3dad6c4048746e8a51b5aed52a52 100644 GIT binary patch literal 5009 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 bj%Xr6r6(^@QnXO4k8qt|J%djI^5{Q5KxV!` literal 4934 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 EdXVmxOaK4?