From a12737dee32f4d69f73e931c032c391fc585f25a Mon Sep 17 00:00:00 2001 From: okxlin Date: Tue, 18 Jul 2023 09:12:56 +0800 Subject: [PATCH] =?UTF-8?q?feat:=E6=9B=B4=E6=96=B0jellyfin=E5=92=8Cwgcf-so?= =?UTF-8?q?cks5-proxy?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apps/jellyfin/10.8.10/data/cache/.gitkeep | 0 apps/jellyfin/10.8.10/data/config/.gitkeep | 0 apps/jellyfin/10.8.10/data/media/.gitkeep | 0 apps/jellyfin/latest/.env.sample | 4 +++ apps/jellyfin/latest/data.yml | 24 +++++++++++++++ apps/jellyfin/latest/docker-compose.yml | 20 +++++++++++++ apps/jellyfin/unstable/data/cache/.gitkeep | 0 apps/jellyfin/unstable/data/config/.gitkeep | 0 apps/jellyfin/unstable/data/media/.gitkeep | 0 apps/wgcf-socks5-proxy/latest/.env.sample | 6 +++- apps/wgcf-socks5-proxy/latest/data.yml | 30 +++++++++++++++++++ .../latest/docker-compose.yml | 7 ++++- 12 files changed, 89 insertions(+), 2 deletions(-) delete mode 100644 apps/jellyfin/10.8.10/data/cache/.gitkeep delete mode 100644 apps/jellyfin/10.8.10/data/config/.gitkeep delete mode 100644 apps/jellyfin/10.8.10/data/media/.gitkeep create mode 100644 apps/jellyfin/latest/.env.sample create mode 100644 apps/jellyfin/latest/data.yml create mode 100644 apps/jellyfin/latest/docker-compose.yml delete mode 100644 apps/jellyfin/unstable/data/cache/.gitkeep delete mode 100644 apps/jellyfin/unstable/data/config/.gitkeep delete mode 100644 apps/jellyfin/unstable/data/media/.gitkeep diff --git a/apps/jellyfin/10.8.10/data/cache/.gitkeep b/apps/jellyfin/10.8.10/data/cache/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/jellyfin/10.8.10/data/config/.gitkeep b/apps/jellyfin/10.8.10/data/config/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/jellyfin/10.8.10/data/media/.gitkeep b/apps/jellyfin/10.8.10/data/media/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/jellyfin/latest/.env.sample b/apps/jellyfin/latest/.env.sample new file mode 100644 index 00000000..7bc696a4 --- /dev/null +++ b/apps/jellyfin/latest/.env.sample @@ -0,0 +1,4 @@ +CONTAINER_NAME=jellyfin +PANEL_APP_PORT_HTTP=8096 +CACHE_FOLDER_PATH="./data/media" +MEDIA_FOLDER_PATH="./data/cache" \ No newline at end of file diff --git a/apps/jellyfin/latest/data.yml b/apps/jellyfin/latest/data.yml new file mode 100644 index 00000000..1c50ece1 --- /dev/null +++ b/apps/jellyfin/latest/data.yml @@ -0,0 +1,24 @@ +additionalProperties: + formFields: + - default: 8096 + edit: true + envKey: PANEL_APP_PORT_HTTP + labelEn: WebUI Port + labelZh: 网页端口 + required: true + rule: paramPort + type: number + - default: ./data/media + edit: true + envKey: MEDIA_FOLDER_PATH + labelEn: Media folder path + labelZh: 媒体文件夹路径 + required: true + type: text + - default: ./data/cache + edit: true + envKey: CACHE_FOLDER_PATH + labelEn: Cache folder path + labelZh: 缓存文件夹路径 + required: true + type: text diff --git a/apps/jellyfin/latest/docker-compose.yml b/apps/jellyfin/latest/docker-compose.yml new file mode 100644 index 00000000..0718ddd1 --- /dev/null +++ b/apps/jellyfin/latest/docker-compose.yml @@ -0,0 +1,20 @@ +version: "3" +services: + jellyfin: + container_name: ${CONTAINER_NAME} + restart: always + networks: + - 1panel-network + ports: + - "${PANEL_APP_PORT_HTTP}:8096" + volumes: + - "./data/config:/config" + - "${CACHE_FOLDER_PATH}:/cache" + - "${MEDIA_FOLDER_PATH}:/media/media" + image: "jellyfin/jellyfin:latest" + labels: + createdBy: "Apps" + +networks: + 1panel-network: + external: true \ No newline at end of file diff --git a/apps/jellyfin/unstable/data/cache/.gitkeep b/apps/jellyfin/unstable/data/cache/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/jellyfin/unstable/data/config/.gitkeep b/apps/jellyfin/unstable/data/config/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/jellyfin/unstable/data/media/.gitkeep b/apps/jellyfin/unstable/data/media/.gitkeep deleted file mode 100644 index e69de29b..00000000 diff --git a/apps/wgcf-socks5-proxy/latest/.env.sample b/apps/wgcf-socks5-proxy/latest/.env.sample index 0125f287..c647495b 100644 --- a/apps/wgcf-socks5-proxy/latest/.env.sample +++ b/apps/wgcf-socks5-proxy/latest/.env.sample @@ -1,4 +1,8 @@ CONTAINER_NAME="wgcf-socks5-proxy" PANEL_APP_PORT_HTTP="40055" DATA_PATH="./data" -IP_COMMAND="" \ No newline at end of file +IP_COMMAND="" +SOCKS_USER="" +SOCKS_PWD="" +SOCKS_PORT="1080" +SOCKS_HOST="0.0.0.0" diff --git a/apps/wgcf-socks5-proxy/latest/data.yml b/apps/wgcf-socks5-proxy/latest/data.yml index 5e3a4e58..e20b83cf 100644 --- a/apps/wgcf-socks5-proxy/latest/data.yml +++ b/apps/wgcf-socks5-proxy/latest/data.yml @@ -22,3 +22,33 @@ additionalProperties: labelZh: 仅IPV4/IPV6(填"-4";"-6") required: false type: text + - default: "" + edit: true + envKey: SOCKS_USER + labelEn: Socks user + labelZh: Socks用户名 + required: false + type: text + - default: "" + edit: true + envKey: SOCKS_PWD + labelEn: Socks password + labelZh: Socks密码 + random: false + required: false + rule: paramComplexity + type: password + - default: "1080" + edit: true + envKey: SOCKS_PORT + labelEn: Internal Socks port + labelZh: 内部Socks端口 + required: true + type: text + - default: "0.0.0.0" + edit: true + envKey: SOCKS_HOST + labelEn: Internal Socks host + labelZh: 内部Socks主机 + required: true + type: text \ No newline at end of file diff --git a/apps/wgcf-socks5-proxy/latest/docker-compose.yml b/apps/wgcf-socks5-proxy/latest/docker-compose.yml index d6e678cf..6ede490c 100644 --- a/apps/wgcf-socks5-proxy/latest/docker-compose.yml +++ b/apps/wgcf-socks5-proxy/latest/docker-compose.yml @@ -6,10 +6,15 @@ services: networks: - 1panel-network ports: - - "${PANEL_APP_PORT_HTTP}:1080" + - "${PANEL_APP_PORT_HTTP}:${SOCKS_PORT}" volumes: - "${DATA_PATH}:/wgcf" - /lib/modules:/lib/modules + environment: + - USER=${SOCKS_USER} + - PASSWORD=${SOCKS_PWD} + - PORT=${SOCKS_PORT} + - HOST=${SOCKS_HOST} privileged: true cap_add: - net_admin