🌴 Sync 2026-03-05 23:51:42

This commit is contained in:
github-actions[bot] committed 2026-03-05 23:51:42 +08:00
1 parent 97c049ed0a
commit 0acff03804
14253 files changed
+3893239

No files matched your search

+24
View File
@@ -0,0 +1,24 @@
include $(TOPDIR)/rules.mk
PKG_VERSION:=1.1.0-20251012
PKG_RELEASE:=1
LUCI_TITLE:=LuCI support for Ubuntu2
LUCI_PKGARCH:=all
LUCI_DEPENDS:=+lsblk +docker +dockerd +luci-lib-taskd
define Package/luci-app-ubuntu2/conffiles
/etc/config/ubuntu2
endef
define Package/luci-app-ubuntu2/prerm
#!/bin/sh
/usr/libexec/istorec/ubuntu2.sh stop
exit 0
endef
include $(TOPDIR)/feeds/luci/luci.mk
# call BuildPackage - OpenWrt buildroot signature
+7
View File
@@ -0,0 +1,7 @@
module("luci.controller.ubuntu2", package.seeall)
function index()
entry({"admin", "services", "ubuntu2"}, alias("admin", "services", "ubuntu2", "config"), _("Ubuntu2"), 30).dependent = true
entry({"admin", "services", "ubuntu2", "config"}, cbi("ubuntu2"))
end
@@ -0,0 +1,63 @@
--[[
LuCI - Lua Configuration Interface
]]--
local taskd = require "luci.model.tasks"
local docker = require "luci.docker"
local ubuntu2_model = require "luci.model.ubuntu2"
local m, s, o
m = taskd.docker_map("ubuntu2", "ubuntu2", "/usr/libexec/istorec/ubuntu2.sh",
translate("Ubuntu2"),
translate("Ubuntu2 is a high-Performance ubuntu with web remote desktop. [username: abc, password is empty]")
.. translate("Official website:") .. ' <a href=\"https://www.kasmweb.com\" target=\"_blank\">https://www.kasmweb.com</a>')
local dk = docker.new({socket_path="/var/run/docker.sock"})
local dockerd_running = dk:_ping().code == 200
local docker_info = dockerd_running and dk:info().body or {}
local docker_aspace = 0
if docker_info.DockerRootDir then
local statvfs = nixio.fs.statvfs(docker_info.DockerRootDir)
docker_aspace = statvfs and (statvfs.bavail * statvfs.bsize) or 0
end
s = m:section(SimpleSection, translate("Service Status"), translate("Ubuntu2 status:"))
s:append(Template("ubuntu2/status"))
s = m:section(TypedSection, "main", translate("Setup"), translate("The following parameters will only take effect during installation or upgrade:"))
s.addremove=false
s.anonymous=true
o = s:option(Value, "https_port", translate("HTTPS Port").."<b>*</b>")
o.default = "3001"
o.datatype = "port"
o = s:option(Value, "image_name", translate("Image").."<b>*</b>")
o.rmempty = false
o.datatype = "string"
if "x86_64" == docker_info.Architecture then
o:value("linkease/desktop-ubuntu2-standard-amd64:latest", "Standard-AMD64")
o.default = "linkease/desktop-ubuntu2-standard-amd64:latest"
else
o:value("linkease/desktop-ubuntu2-standard-arm64:latest", "Standard-ARM64")
o.default = "linkease/desktop-ubuntu2-standard-arm64:latest"
end
o = s:option(Value, "password", "PASSWORD")
o.password = true
o.datatype = "string"
local blocks = ubuntu2_model.blocks()
local home = ubuntu2_model.home()
o = s:option(Value, "config_path", translate("Config path").."<b>*</b>")
o.rmempty = false
o.datatype = "string"
local paths, default_path = ubuntu2_model.find_paths(blocks, home, "Configs")
for _, val in pairs(paths) do
o:value(val, val)
end
o.default = default_path
return m
+55
View File
@@ -0,0 +1,55 @@
local util = require "luci.util"
local jsonc = require "luci.jsonc"
local ubuntu2 = {}
ubuntu2.blocks = function()
local f = io.popen("lsblk -s -f -b -o NAME,FSSIZE,MOUNTPOINT --json", "r")
local vals = {}
if f then
local ret = f:read("*all")
f:close()
local obj = jsonc.parse(ret)
for _, val in pairs(obj["blockdevices"]) do
local fsize = val["fssize"]
if fsize ~= nil and string.len(fsize) > 10 and val["mountpoint"] then
-- fsize > 1G
vals[#vals+1] = val["mountpoint"]
end
end
end
return vals
end
ubuntu2.home = function()
local uci = require "luci.model.uci".cursor()
local home_dirs = {}
home_dirs["main_dir"] = uci:get_first("quickstart", "main", "main_dir", "/root")
home_dirs["Configs"] = uci:get_first("quickstart", "main", "conf_dir", home_dirs["main_dir"].."/Configs")
home_dirs["Public"] = uci:get_first("quickstart", "main", "pub_dir", home_dirs["main_dir"].."/Public")
home_dirs["Downloads"] = uci:get_first("quickstart", "main", "dl_dir", home_dirs["Public"].."/Downloads")
home_dirs["Caches"] = uci:get_first("quickstart", "main", "tmp_dir", home_dirs["main_dir"].."/Caches")
return home_dirs
end
ubuntu2.find_paths = function(blocks, home_dirs, path_name)
local default_path = ''
local configs = {}
default_path = home_dirs[path_name] .. "/Ubuntu2"
if #blocks == 0 then
table.insert(configs, default_path)
else
for _, val in pairs(blocks) do
table.insert(configs, val .. "/" .. path_name .. "/Ubuntu2")
end
local without_conf_dir = "/root/" .. path_name .. "/Ubuntu2"
if default_path == without_conf_dir then
default_path = configs[1]
end
end
return configs, default_path
end
return ubuntu2
@@ -0,0 +1,31 @@
<%
local util = require "luci.util"
local container_status = util.trim(util.exec("/usr/libexec/istorec/ubuntu2.sh status"))
local container_install = (string.len(container_status) > 0)
local container_running = container_status == "running"
-%>
<div class="cbi-value">
<label class="cbi-value-title"><%:Status%></label>
<div class="cbi-value-field">
<% if container_running then %>
<button class="cbi-button cbi-button-success" disabled="true"><%:Ubuntu2 is running%></button>
<% else %>
<button class="cbi-button cbi-button-negative" disabled="true"><%:Ubuntu2 is not running%></button>
<% end %>
</div>
</div>
<%
if container_running then
local port=util.trim(util.exec("/usr/libexec/istorec/ubuntu2.sh port"))
if port == "" then
port="8096"
end
-%>
<div class="cbi-value cbi-value-last">
<label class="cbi-value-title">&nbsp;</label>
<div class="cbi-value-field">
<input type="button" class="btn cbi-button cbi-button-apply" name="start" value="<%:Open Ubuntu2%>" onclick="window.open('https://'+location.hostname+':<%=port%>', '_blank')">
</div>
</div>
<% end %>
+38
View File
@@ -0,0 +1,38 @@
msgid ""
msgstr "Content-Type: text/plain; charset=UTF-8"
msgid "Official website:"
msgstr "官方网站:"
msgid "Ubuntu2 is a high-Performance ubuntu with web remote desktop. [username: abc, password is empty]"
msgstr "Ubuntu2 是带浏览器桌面的高性能 Ubuntu. [用户名: abc, 密码为空]。"
msgid "Config path"
msgstr "配置文件路径"
msgid "HTTPS Port"
msgstr "HTTPS 端口"
msgid "Service Status"
msgstr "服务状态"
msgid "Ubuntu2 status:"
msgstr "Ubuntu2 的状态信息如下:"
msgid "Setup"
msgstr "安装配置"
msgid "The following parameters will only take effect during installation or upgrade:"
msgstr "以下参数只在安装或者升级时才会生效:"
msgid "Status"
msgstr "状态"
msgid "Ubuntu2 is running"
msgstr "Ubuntu2 运行中"
msgid "Ubuntu2 is not running"
msgstr "Ubuntu2 未运行"
msgid "Open Ubuntu2"
msgstr "打开 Ubuntu2"
+1
View File
@@ -0,0 +1 @@
zh-cn
+3
View File
@@ -0,0 +1,3 @@
config main
# option 'config_path' ''
+92
View File
@@ -0,0 +1,92 @@
#!/bin/sh
# Author Xiaobao(xiaobao@linkease.com)
ACTION=${1}
shift 1
do_install() {
local https_port=`uci get ubuntu2.@main[0].https_port 2>/dev/null`
local image_name=`uci get ubuntu2.@main[0].image_name 2>/dev/null`
local config=`uci get ubuntu2.@main[0].config_path 2>/dev/null`
local pwd=`uci get ubuntu2.@main[0].password 2>/dev/null`
if [ -z ${IMAGE_NAME} ]; then
local arch=`uname -m`
if [ "$arch" = "x86_64" ]; then
IMAGE_NAME=linkease/desktop-ubuntu2-standard-amd64:latest
else
IMAGE_NAME=linkease/desktop-ubuntu2-standard-arm64:latest
fi
fi
echo "docker pull ${image_name}"
docker pull ${image_name}
docker rm -f ubuntu2
if [ -z "$config" ]; then
echo "config path is empty!"
exit 1
fi
# not conflict with jellyfin
[ -z "$https_port" ] && https_port=3001
local cmd="docker run --restart=unless-stopped -d --user 0:0 -e START_DOCKER=false -v \"$config:/config\" \
--privileged --device /dev/fuse --security-opt apparmor=unconfined --shm-size=512m \
-v /var/run/docker.sock:/var/run/docker.sock \
--dns=172.17.0.1 \
-p $https_port:3001 "
if [ -n "$pwd" ]; then
cmd="$cmd -e \"PASSWORD=$pwd\" "
fi
if [ -d /dev/dri ]; then
cmd="$cmd\
--device /dev/dri:/dev/dri "
fi
local tz="`uci get system.@system[0].zonename | sed 's/ /_/g'`"
[ -z "$tz" ] || cmd="$cmd -e TZ=$tz"
cmd="$cmd -v /mnt:/mnt"
mountpoint -q /mnt && cmd="$cmd:rslave"
cmd="$cmd --name ubuntu2 \"$image_name\""
echo "$cmd"
eval "$cmd"
}
usage() {
echo "usage: $0 sub-command"
echo "where sub-command is one of:"
echo " install Install the ubuntu2"
echo " upgrade Upgrade the ubuntu2"
echo " rm/start/stop/restart Remove/Start/Stop/Restart the ubuntu2"
echo " status Ubuntu2 status"
echo " port Ubuntu2 port"
}
case ${ACTION} in
"install")
do_install
;;
"upgrade")
do_install
;;
"rm")
docker rm -f ubuntu2
;;
"start" | "stop" | "restart")
docker ${ACTION} ubuntu2
;;
"status")
docker ps --all -f 'name=^/ubuntu2$' --format '{{.State}}'
;;
"port")
docker ps --all -f 'name=^/ubuntu2$' --format '{{.Ports}}' | grep -om1 '0.0.0.0:[0-9]*->3001/tcp' | sed 's/0.0.0.0:\([0-9]*\)->.*/\1/'
;;
*)
usage
exit 1
;;
esac
@@ -0,0 +1,11 @@
{
"luci-app-ubuntu2": {
"description": "Grant UCI access for luci-app-ubuntu2",
"read": {
"uci": [ "ubuntu2" ]
},
"write": {
"uci": [ "ubuntu2" ]
}
}
}