Merge remote-tracking branch 'origin/custom' into custom

apps/dpanel-lite/1.5.3/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   dpanel:
-    image: dpanel/dpanel:1.5.2-lite
+    image: dpanel/dpanel:1.5.3-lite
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/dpanel/1.5.3/docker-compose.yml

@@ -4,7 +4,7 @@ networks:
 
 services:
   dpanel:
-    image: dpanel/dpanel:1.5.2
+    image: dpanel/dpanel:1.5.3
     container_name: ${CONTAINER_NAME}
     labels:
       createdBy: "Apps"

apps/rsshub/2025-01-22/docker-compose.yml

@@ -23,7 +23,7 @@ services:
       timeout: 10s
       retries: 3
   rsshub:
-    image: diygod/rsshub:2025-01-21
+    image: diygod/rsshub:2025-01-22
     container_name: rsshub-${CONTAINER_NAME}
     depends_on:
       - browserless

appstore/dpanel-lite/1.5.3/docker-compose.yml

@@ -10,7 +10,7 @@ services:
     environment:
     - APP_NAME=${CONTAINER_NAME}
     - HTTPS_PROXY=${HTTP_PROXY}
-    image: dpanel/dpanel:1.5.2-lite
+    image: dpanel/dpanel:1.5.3-lite
     labels:
       createdBy: Apps
     networks:

appstore/dpanel/1.5.3/docker-compose.yml

@@ -10,7 +10,7 @@ services:
     environment:
     - APP_NAME=${CONTAINER_NAME}
     - HTTPS_PROXY=${HTTP_PROXY}
-    image: dpanel/dpanel:1.5.2
+    image: dpanel/dpanel:1.5.3
     labels:
       createdBy: Apps
     networks:

appstore/ikaros/2.6.1/.env

@@ -0,0 +1,6 @@
+# 数据持久化路径 [必填] 
+IKAROS_ROOT_PATH=/home/ikaros
+
+# WebUI 端口 [必填] 
+PANEL_APP_PORT_HTTP=12346
+

appstore/ikaros/2.6.1/data.yml

@@ -0,0 +1,17 @@
+additionalProperties:
+  formFields:
+    - default: "/home/ikaros"
+      edit: true
+      envKey: IKAROS_ROOT_PATH
+      labelZh: 数据持久化路径
+      labelEn: Data persistence path
+      required: true
+      type: text
+    - default: 12346
+      edit: true
+      envKey: PANEL_APP_PORT_HTTP
+      labelZh: WebUI 端口
+      labelEn: WebUI port
+      required: true
+      rule: paramPort
+      type: number

appstore/ikaros/2.6.1/docker-compose.yml

@@ -0,0 +1,24 @@
+networks:
+  1panel-network:
+    external: true
+services:
+  ikaros:
+    container_name: ikaros
+    env_file:
+    - ./envs/global.env
+    - .env
+    environment:
+    - PUID=0
+    - PGID=0
+    - TZ=Asia/Shanghai
+    image: suwmlee/ikaros:2.6.1
+    labels:
+      createdBy: Apps
+    networks:
+    - 1panel-network
+    ports:
+    - ${PANEL_APP_PORT_HTTP}:12346
+    restart: always
+    volumes:
+    - ${IKAROS_ROOT_PATH}/media:/media
+    - ${IKAROS_ROOT_PATH}/data:/app/data

appstore/ikaros/README.md

@@ -0,0 +1,19 @@
+# ikaros
+
+打通下载软件与媒体服务，安心享受影片
+
+![ikaros](https://file.lifebus.top/imgs/ikaros_cover.png)
+
+![](https://img.shields.io/badge/%E6%96%B0%E7%96%86%E8%90%8C%E6%A3%AE%E8%BD%AF%E4%BB%B6%E5%BC%80%E5%8F%91%E5%B7%A5%E4%BD%9C%E5%AE%A4-%E6%8F%90%E4%BE%9B%E6%8A%80%E6%9C%AF%E6%94%AF%E6%8C%81-blue)
+
+## 简介
+
++ 批量软/硬链接
++ 批量修改文件名，优化剧集名及自定义
++ JAV刮削及自定义
++ 自动清理关联的软/硬链接及种子文件
++ 托管（忘记这款软件，安心看片）
+
+---
+
+![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png)

appstore/ikaros/data.yml

@@ -0,0 +1,14 @@
+additionalProperties:
+  key: ikaros
+  name: ikaros
+  tags:
+    - WebSite
+    - Local
+  shortDescZh: 打通下载软件与媒体服务，安心享受影片
+  shortDescEn: Connect download software and media services, enjoy movies with peace of mind
+  type: website
+  crossVersionUpdate: true
+  limit: 0
+  website: https://github.com/Suwmlee/ikaros/
+  github: https://github.com/Suwmlee/ikaros/
+  document: https://github.com/Suwmlee/ikaros/

appstore/jellyfin/10.10.4/docker-compose.yml

@@ -10,7 +10,7 @@ services:
     - ROC_ENABLE_PRE_VEGA=1
     - HTTPS_PROXY=${HTTP_PROXY:-}
     - NO_PROXY=localhost,127.0.0.1,::1
-    image: jellyfin/jellyfin:10.10.3
+    image: jellyfin/jellyfin:10.10.4
     labels:
       createdBy: Apps
     network_mode: ${NETWORK_MODE}

appstore/onedev/11.6.11/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     - initial_email=${INITIAL_EMAIL}
     - initial_server_url=${INITIAL_SERVER_URL}
     - initial_ssh_root_url=${INITIAL_SSH_ROOT_URL}
-    image: 1dev/server:11.6.10
+    image: 1dev/server:11.6.11
     labels:
       createdBy: Apps
     networks:

appstore/rsshub/2025-01-22/docker-compose.yml

@@ -57,7 +57,7 @@ services:
       - -f
       - http://localhost:1200/healthz?key=${ACCESS_KEY}
       timeout: 10s
-    image: diygod/rsshub:2025-01-21
+    image: diygod/rsshub:2025-01-22
     labels:
       createdBy: Apps
     networks:

appstore/rsshub/2025-01-22/scripts/init.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  sed -i '/^GLOBAL_ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi

appstore/rsshub/2025-01-22/scripts/uninstall.sh

@@ -0,0 +1,10 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi

appstore/rsshub/2025-01-22/scripts/upgrade.sh

@@ -0,0 +1,17 @@
+#!/bin/bash
+
+if [ -f .env ]; then
+  source .env
+
+  # setup-1 add default values
+  CURRENT_DIR=$(pwd)
+  sed -i '/^ENV_FILE=/d' .env
+  sed -i '/^GLOBAL_ENV_FILE=/d' .env
+  echo "ENV_FILE=${CURRENT_DIR}/.env" >> .env
+  echo "GLOBAL_ENV_FILE=${CURRENT_DIR}/envs/global.env" >> .env
+
+  echo "Check Finish."
+
+else
+  echo "Error: .env file not found."
+fi

appstore/stash/0.27.2/docker-compose.yml

@@ -14,7 +14,6 @@ services:
     - STASH_GENERATED=/generated/
     - STASH_METADATA=/metadata/
     - STASH_CACHE=/cache/
-    - HTTPS_PROXY=${HTTP_PROXY:-}
     image: stashapp/stash:v0.27.2
     labels:
       createdBy: Apps

appstore/stash/README.md

@@ -18,6 +18,18 @@ Stash 是一个用 Go 语言编写的网页应用程序，用于为您存储和
 
 + Stash 提供关于表演者、标签、工作室等统计信息。
 
+## 安装说明
+
+### 网络代理
+
+请前往持久化目录下, 修改 `config/config.yml` 配置文件。
+
+增加配置：
+
+```yml
+proxy: http://127.0.0.1:7890
+```
+
 ---
 
 ![Ms Studio](https://file.lifebus.top/imgs/ms_blank_001.png)

dockge/dpanel-lite/docker-compose.yml

@@ -10,7 +10,7 @@ services:
     environment:
     - APP_NAME=${CONTAINER_NAME}
     - HTTPS_PROXY=${HTTP_PROXY}
-    image: dpanel/dpanel:1.5.2-lite
+    image: dpanel/dpanel:1.5.3-lite
     labels:
       createdBy: Apps
     networks:

dockge/dpanel/docker-compose.yml

@@ -10,7 +10,7 @@ services:
     environment:
     - APP_NAME=${CONTAINER_NAME}
     - HTTPS_PROXY=${HTTP_PROXY}
-    image: dpanel/dpanel:1.5.2
+    image: dpanel/dpanel:1.5.3
     labels:
       createdBy: Apps
     networks:

dockge/ikaros/.env

@@ -0,0 +1,6 @@
+# 数据持久化路径 [必填] 
+IKAROS_ROOT_PATH=/home/ikaros
+
+# WebUI 端口 [必填] 
+PANEL_APP_PORT_HTTP=12346
+

dockge/ikaros/docker-compose.yml

@@ -0,0 +1,24 @@
+networks:
+  1panel-network:
+    external: true
+services:
+  ikaros:
+    container_name: ikaros
+    env_file:
+    - ./envs/global.env
+    - .env
+    environment:
+    - PUID=0
+    - PGID=0
+    - TZ=Asia/Shanghai
+    image: suwmlee/ikaros:2.6.1
+    labels:
+      createdBy: Apps
+    networks:
+    - 1panel-network
+    ports:
+    - ${PANEL_APP_PORT_HTTP}:12346
+    restart: always
+    volumes:
+    - ${IKAROS_ROOT_PATH}/media:/media
+    - ${IKAROS_ROOT_PATH}/data:/app/data

dockge/ikaros/envs/default.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+ENV_FILE=.env

dockge/ikaros/envs/global.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+TZ=Asia/Shanghai

dockge/jellyfin_10_10_4/docker-compose.yml

@@ -10,7 +10,7 @@ services:
     - ROC_ENABLE_PRE_VEGA=1
     - HTTPS_PROXY=${HTTP_PROXY:-}
     - NO_PROXY=localhost,127.0.0.1,::1
-    image: jellyfin/jellyfin:10.10.3
+    image: jellyfin/jellyfin:10.10.4
     labels:
       createdBy: Apps
     network_mode: ${NETWORK_MODE}

dockge/jellyfin_10_10_4/envs/default.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+ENV_FILE=.env

dockge/jellyfin_10_10_4/envs/global.env

@@ -0,0 +1,2 @@
+# copyright© 2024 XinJiang Ms Studio
+TZ=Asia/Shanghai

dockge/onedev/docker-compose.yml

@@ -14,7 +14,7 @@ services:
     - initial_email=${INITIAL_EMAIL}
     - initial_server_url=${INITIAL_SERVER_URL}
     - initial_ssh_root_url=${INITIAL_SSH_ROOT_URL}
-    image: 1dev/server:11.6.10
+    image: 1dev/server:11.6.11
     labels:
       createdBy: Apps
     networks:

dockge/rsshub/docker-compose.yml

@@ -57,7 +57,7 @@ services:
       - -f
       - http://localhost:1200/healthz?key=${ACCESS_KEY}
       timeout: 10s
-    image: diygod/rsshub:2025-01-21
+    image: diygod/rsshub:2025-01-22
     labels:
       createdBy: Apps
     networks:

dockge/stash/docker-compose.yml

@@ -14,7 +14,6 @@ services:
     - STASH_GENERATED=/generated/
     - STASH_METADATA=/metadata/
     - STASH_CACHE=/cache/
-    - HTTPS_PROXY=${HTTP_PROXY:-}
     image: stashapp/stash:v0.27.2
     labels:
       createdBy: Apps