Skip to content

Commit 3e685dd

Browse files
authored
Merge branch 'wukongdaily:master' into daily
2 parents faa7846 + b528106 commit 3e685dd

3 files changed

Lines changed: 10 additions & 0 deletions

File tree

.github/workflows/build-rockchip-immortalWrt-24.10.x.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -128,6 +128,13 @@ jobs:
128128
fi
129129
fi
130130
131+
- name: Check Docker
132+
run: |
133+
if [[ "${{ inputs.include_docker }}" == "yes" ]]; then
134+
echo 'CUSTOM_PACKAGES="$CUSTOM_PACKAGES docker"' >> shell/custom-packages.sh
135+
echo "✅ 已为Rockchip平台补充 docker 组件"
136+
fi
137+
131138
- name: Enable Store integration
132139
run: |
133140
if [ "${{ github.event.inputs.enable_store }}" == "true" ]; then

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ https://wkdaily.cpolar.cn/15
9696
### 高级卸载插件出处 by VedioTalk https://xz.vumstar.com
9797
### 新增极光主题 来自 https://github.com/eamonxg/luci-theme-aurora
9898
### 新增Bandix流量监控 来自 https://github.com/timsaya/luci-app-bandix
99+
### 新增rtp2httpd 来自https://github.com/stackia/rtp2httpd
99100

100101
## ❤️赞助作者 ⬇️⬇️
101102

shell/custom-packages.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,4 +58,6 @@ CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-theme-aurora"
5858
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-i18n-ipsec-vpnd-zh-cn"
5959
# Bandix流量监控 by timsaya
6060
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-bandix luci-i18n-bandix-zh-cn"
61+
# IPTV 流媒体转发服务器 - rtp2httpd by stackia
62+
#CUSTOM_PACKAGES="$CUSTOM_PACKAGES luci-app-rtp2httpd luci-i18n-rtp2httpd-zh-cn"
6163

0 commit comments

Comments
 (0)