From 471cbd9d358e4202496d979b378740ff010d5aec Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 12 Aug 2025 22:00:44 +0800 Subject: [PATCH] Update Syncthing to v2 (major) (#1187) --- apps/syncthing-discosrv/2.0.0/data.yml | 10 ++++ .../2.0.0/docker-compose.yml | 21 ++++++++ apps/syncthing-relaysrv/2.0.0/data.yml | 10 ++++ .../2.0.0/docker-compose.yml | 22 ++++++++ apps/syncthing/2.0.0/.env.sample | 8 +++ apps/syncthing/2.0.0/data.yml | 54 +++++++++++++++++++ apps/syncthing/2.0.0/docker-compose.yml | 27 ++++++++++ 7 files changed, 152 insertions(+) create mode 100644 apps/syncthing-discosrv/2.0.0/data.yml create mode 100644 apps/syncthing-discosrv/2.0.0/docker-compose.yml create mode 100644 apps/syncthing-relaysrv/2.0.0/data.yml create mode 100644 apps/syncthing-relaysrv/2.0.0/docker-compose.yml create mode 100644 apps/syncthing/2.0.0/.env.sample create mode 100644 apps/syncthing/2.0.0/data.yml create mode 100644 apps/syncthing/2.0.0/docker-compose.yml diff --git a/apps/syncthing-discosrv/2.0.0/data.yml b/apps/syncthing-discosrv/2.0.0/data.yml new file mode 100644 index 000000000..e186af1d2 --- /dev/null +++ b/apps/syncthing-discosrv/2.0.0/data.yml @@ -0,0 +1,10 @@ +additionalProperties: + formFields: + - default: "8443" + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: 发现服务器端口 + labelEn: Discovery server port + required: true + rule: paramPort + type: number \ No newline at end of file diff --git a/apps/syncthing-discosrv/2.0.0/docker-compose.yml b/apps/syncthing-discosrv/2.0.0/docker-compose.yml new file mode 100644 index 000000000..3b07bfc5f --- /dev/null +++ b/apps/syncthing-discosrv/2.0.0/docker-compose.yml @@ -0,0 +1,21 @@ +networks: + 1panel-network: + external: true + +services: + syncthing_discosrv: + container_name: ${CONTAINER_NAME} + environment: + - PUID=1001 + - PGID=1001 + - TZ=Asia/Shanghai + image: syncthing/discosrv:2.0.0 + labels: + createdBy: "Apps" + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:8443 + restart: always + volumes: + - ./data:/var/stdiscosrv diff --git a/apps/syncthing-relaysrv/2.0.0/data.yml b/apps/syncthing-relaysrv/2.0.0/data.yml new file mode 100644 index 000000000..ae79aa587 --- /dev/null +++ b/apps/syncthing-relaysrv/2.0.0/data.yml @@ -0,0 +1,10 @@ +additionalProperties: + formFields: + - default: "22067" + edit: true + envKey: PANEL_APP_PORT_HTTP + labelZh: 中继服务器端口 + labelEn: Relay server port + required: true + rule: paramPort + type: number \ No newline at end of file diff --git a/apps/syncthing-relaysrv/2.0.0/docker-compose.yml b/apps/syncthing-relaysrv/2.0.0/docker-compose.yml new file mode 100644 index 000000000..7b01b153f --- /dev/null +++ b/apps/syncthing-relaysrv/2.0.0/docker-compose.yml @@ -0,0 +1,22 @@ +networks: + 1panel-network: + external: true +services: + syncthing_relaysrv: + command: -pools="" -listen=":22067" + container_name: ${CONTAINER_NAME} + environment: + - PUID=1001 + - PGID=1001 + - pools="" + image: syncthing/relaysrv:2.0.0 + labels: + createdBy: "Apps" + networks: + - 1panel-network + ports: + - ${PANEL_APP_PORT_HTTP}:22067 # 中继服务器的数据连接端口(必须开启) + # - 22070:22070 # 用于公用的中继服务器池,显示数据传输、客户端数量等状态,可不开启 + restart: always + volumes: + - ./data:/var/strelaysrv diff --git a/apps/syncthing/2.0.0/.env.sample b/apps/syncthing/2.0.0/.env.sample new file mode 100644 index 000000000..95246308d --- /dev/null +++ b/apps/syncthing/2.0.0/.env.sample @@ -0,0 +1,8 @@ +CONTAINER_NAME="syncthing" +DATA_PATH_APP_CONFIG="./data/config" +DATA_PATH_DATA1="./data/data1" +DATA_PATH_DATA2="./data/data2" +PANEL_APP_PORT_HTTP="40118" +SYNCTHING_PORT="22000" +SYNCTHING_PORT_EXTRA_UDP="21027" +TIME_ZONE="Asia/Shanghai" diff --git a/apps/syncthing/2.0.0/data.yml b/apps/syncthing/2.0.0/data.yml new file mode 100644 index 000000000..603a67701 --- /dev/null +++ b/apps/syncthing/2.0.0/data.yml @@ -0,0 +1,54 @@ +additionalProperties: + formFields: + - default: 40118 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: Port + labelZh: 端口 + required: true + rule: paramPort + type: number + - default: 22000 + edit: true + envKey: SYNCTHING_PORT + labelEn: Sync Port + labelZh: 同步端口 + required: true + rule: paramPort + type: number + - default: 21027 + edit: true + envKey: SYNCTHING_PORT_EXTRA_UDP + labelEn: Sync Port + labelZh: 同步端口 + required: true + rule: paramPort + type: number + - default: ./data/config + edit: true + envKey: DATA_PATH_APP_CONFIG + labelEn: Config folder path + labelZh: 配置文件夹路径 + required: true + type: text + - default: ./data/data1 + edit: true + envKey: DATA_PATH_DATA1 + labelEn: Data folder path (internal "/data1") + labelZh: 数据文件夹路径 (内部"/data1") + required: true + type: text + - default: ./data/data2 + edit: true + envKey: DATA_PATH_DATA2 + labelEn: Data folder path (internal "/data2") + labelZh: 数据文件夹路径 (内部"/data2") + required: true + type: text + - default: Asia/Shanghai + edit: true + envKey: TIME_ZONE + labelEn: Time zone + labelZh: 时区 + required: true + type: text diff --git a/apps/syncthing/2.0.0/docker-compose.yml b/apps/syncthing/2.0.0/docker-compose.yml new file mode 100644 index 000000000..d604c7cf5 --- /dev/null +++ b/apps/syncthing/2.0.0/docker-compose.yml @@ -0,0 +1,27 @@ +services: + syncthing: + container_name: ${CONTAINER_NAME} + restart: always + networks: + - 1panel-network + hostname: syncthing + environment: + - PUID=1000 + - PGID=1000 + - TZ=${TIME_ZONE} + volumes: + - ${DATA_PATH_APP_CONFIG}:/config + - ${DATA_PATH_DATA1}:/data1 + - ${DATA_PATH_DATA2}:/data2 + ports: + - ${PANEL_APP_PORT_HTTP}:8384 + - ${SYNCTHING_PORT}:22000/tcp + - ${SYNCTHING_PORT}:22000/udp + - ${SYNCTHING_PORT_EXTRA_UDP}:21027/udp + image: syncthing/syncthing:2.0.0 + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true