From 8441e48eeae4527b6ffc2ccf53db6f1253ffd91b Mon Sep 17 00:00:00 2001 From: YGAS Date: Fri, 24 Dec 2021 13:10:32 +0800 Subject: [PATCH] add luci-app-ubuntu --- applications/luci-app-ubuntu/Makefile | 19 +++ .../luasrc/controller/ubuntu.lua | 143 ++++++++++++++++++ .../luasrc/model/cbi/ubuntu/status.lua | 26 ++++ .../luasrc/view/ubuntu/ubuntu.htm | 114 ++++++++++++++ .../luci-app-ubuntu/po/zh-cn/ubuntu.po | 35 +++++ .../luci-app-ubuntu/root/etc/config/ubuntu | 4 + .../luci-app-ubuntu/root/opt/docker/jobs.json | 1 + .../root/usr/share/ubuntu/install.sh | 47 ++++++ 8 files changed, 389 insertions(+) create mode 100644 applications/luci-app-ubuntu/Makefile create mode 100755 applications/luci-app-ubuntu/luasrc/controller/ubuntu.lua create mode 100755 applications/luci-app-ubuntu/luasrc/model/cbi/ubuntu/status.lua create mode 100755 applications/luci-app-ubuntu/luasrc/view/ubuntu/ubuntu.htm create mode 100644 applications/luci-app-ubuntu/po/zh-cn/ubuntu.po create mode 100644 applications/luci-app-ubuntu/root/etc/config/ubuntu create mode 100644 applications/luci-app-ubuntu/root/opt/docker/jobs.json create mode 100755 applications/luci-app-ubuntu/root/usr/share/ubuntu/install.sh diff --git a/applications/luci-app-ubuntu/Makefile b/applications/luci-app-ubuntu/Makefile new file mode 100644 index 0000000..1c066cc --- /dev/null +++ b/applications/luci-app-ubuntu/Makefile @@ -0,0 +1,19 @@ + + +include $(TOPDIR)/rules.mk + +PKG_VERSION:=1.0.1 +PKG_RELEASE:=2021224 + +LUCI_TITLE:=LuCI support for ubuntu +LUCI_PKGARCH:=all +LUCI_DEPENDS:=+docker +luci-app-dockerman + +define Package/luci-app-ubuntu/conffiles +/etc/config/ubuntu +endef + +include $(TOPDIR)/feeds/luci/luci.mk + +# call BuildPackage - OpenWrt buildroot signature + diff --git a/applications/luci-app-ubuntu/luasrc/controller/ubuntu.lua b/applications/luci-app-ubuntu/luasrc/controller/ubuntu.lua new file mode 100755 index 0000000..146219e --- /dev/null +++ b/applications/luci-app-ubuntu/luasrc/controller/ubuntu.lua @@ -0,0 +1,143 @@ +module("luci.controller.ubuntu", package.seeall) + +function index() + + entry({'admin', 'services', 'ubuntu'}, alias('admin', 'services', 'ubuntu', 'client'), _('ubuntu'), 10) + entry({"admin", "services", "ubuntu",'client'}, cbi("ubuntu/status"), nil).leaf = true + + entry({"admin", "services", "ubuntu","status"}, call("get_container_status")) + entry({"admin", "services", "ubuntu","stop"}, post("stop_container")) + entry({"admin", "services", "ubuntu","start"}, post("start_container")) + entry({"admin", "services", "ubuntu","install"}, post("install_container")) + entry({"admin", "services", "ubuntu","uninstall"}, post("uninstall_container")) + +end + +local sys = require "luci.sys" +local uci = require "luci.model.uci".cursor() +local keyword = "ubuntu" +local util = require("luci.util") +local docker = require "luci.model.docker" + +function container_status() + local docker_path = util.exec("which docker") + local docker_install = (string.len(docker_path) > 0) + local docker_running = util.exec("ps | grep dockerd | grep -v 'grep' | wc -l") + local container_id = util.trim(util.exec("docker ps -aqf 'name="..keyword.."'")) + local container_install = (string.len(container_id) > 0) + local container_running = container_install and (string.len(util.trim(util.exec("docker ps -qf 'id="..container_id.."'"))) > 0) + local port = tonumber(uci:get_first(keyword, keyword, "port", "6901")) + + local status = { + docker_install = docker_install, + docker_start = docker_running, + container_id = container_id, + container_port = (port), + container_install = container_install, + container_running = container_running, + password = uci:get_first(keyword, keyword, "password", ""), + } + + return status +end + +function get_container_status() + local status = container_status() + luci.http.prepare_content("application/json") + luci.http.write_json(status) +end + +function stop_container() + local status = container_status() + local container_id = status.container_id + util.exec("docker stop '"..container_id.."'") +end + +function start_container() + local status = container_status() + local container_id = status.container_id + util.exec("docker start '"..container_id.."'") +end + +function install_container() + + local image = util.exec("sh /usr/share/ubuntu/install.sh -l") + local password = luci.http.formvalue("password") + local port = luci.http.formvalue("port") + + uci:tset(keyword, "@"..keyword.."[0]", { + password = password or "password", + port = port or "6901", + }) + uci:save(keyword) + uci:commit(keyword) + + local pull_image = function(image) + docker:append_status("Images: " .. "pulling" .. " " .. image .. "...\n") + local dk = docker.new() + local res = dk.images:create({query = {fromImage=image}}, docker.pull_image_show_status_cb) + if res and res.code and res.code == 200 and (res.body[#res.body] and not res.body[#res.body].error and res.body[#res.body].status and (res.body[#res.body].status == "Status: Downloaded newer image for ".. image or res.body[#res.body].status == "Status: Image is up to date for ".. image)) then + docker:append_status("done\n") + else + res.code = (res.code == 200) and 500 or res.code + docker:append_status("code:" .. res.code.." ".. (res.body[#res.body] and res.body[#res.body].error or (res.body.message or res.message)).. "\n") + end + end + + local install_ubuntu = function() + local os = require "os" + local fs = require "nixio.fs" + local c = ("sh /usr/share/ubuntu/install.sh -i >/tmp/log/ubuntu.stdout 2>/tmp/log/ubuntu.stderr") + -- docker:append_status(c) + + local r = os.execute(c) + local e = fs.readfile("/tmp/log/ubuntu.stderr") + local o = fs.readfile("/tmp/log/ubuntu.stdout") + + fs.unlink("/tmp/log/ubuntu.stderr") + fs.unlink("/tmp/log/ubuntu.stdout") + + if r == 0 then + docker:append_status(o) + else + docker:append_status( e ) + end + end + + -- local status = { + -- shell = shell, + -- image_name = image, + -- } + -- luci.http.prepare_content("application/json") + -- luci.http.write_json(status) + + if image then + docker:write_status("ubuntu installing\n") + pull_image(image) + install_ubuntu() + else + docker:write_status("ubuntu image not defined!\n") + end + +end + + +function uninstall_container() + local status = container_status() + local container_id = status.container_id + util.exec("docker container rm '"..container_id.."'") +end + +-- 总结： +-- docker是否安装 +-- 容器是否安装 +-- 缺少在lua和htm中运行命令的方法 +-- 获取容器id docker ps -aqf'name=ubuntu' +-- 启动容器 docker start 78a8455e6d38 +-- 停止容器 docker stop 78a8455e6d38 + + +--[[ +todo +网络请求提示框 + --]] \ No newline at end of file diff --git a/applications/luci-app-ubuntu/luasrc/model/cbi/ubuntu/status.lua b/applications/luci-app-ubuntu/luasrc/model/cbi/ubuntu/status.lua new file mode 100755 index 0000000..a12f63d --- /dev/null +++ b/applications/luci-app-ubuntu/luasrc/model/cbi/ubuntu/status.lua @@ -0,0 +1,26 @@ +local m, s +local uci = luci.model.uci.cursor() +local sys = require 'luci.sys' +local docker = require "luci.model.docker" + +m = SimpleForm("ubuntu", translate("ubuntu"), translate("Linkease-PC是为EasePi定制的一套Ubuntu系统。纯英文系统，欢迎各位极客玩家享用。") +.. translatef(" " +.. "" +.. "访问官网", "https://easepi.linkease.com/")) +m.submit=false +m.reset=false + +s = m:section(SimpleSection) +s.template = "dockerman/apply_widget" +s.err = docker:read_status() +s.err = s.err and s.err:gsub("\n","
"):gsub(" "," ") +if s.err then + docker:clear_status() +end + + +s=m:section(SimpleSection) +s.template = "ubuntu/ubuntu" + + +return m \ No newline at end of file diff --git a/applications/luci-app-ubuntu/luasrc/view/ubuntu/ubuntu.htm b/applications/luci-app-ubuntu/luasrc/view/ubuntu/ubuntu.htm new file mode 100755 index 0000000..398d13a --- /dev/null +++ b/applications/luci-app-ubuntu/luasrc/view/ubuntu/ubuntu.htm @@ -0,0 +1,114 @@ + + +
+
+ + <%:Collecting data...%> + +
+
diff --git a/applications/luci-app-ubuntu/po/zh-cn/ubuntu.po b/applications/luci-app-ubuntu/po/zh-cn/ubuntu.po new file mode 100644 index 0000000..6bfb107 --- /dev/null +++ b/applications/luci-app-ubuntu/po/zh-cn/ubuntu.po @@ -0,0 +1,35 @@ +msgid "ubuntu" +msgstr "ubuntu" + +msgid "The ubuntu service is running." +msgstr "ubuntu已启动" + +msgid "The ubuntu service is not running." +msgstr "ubuntu服务未启动" + +msgid "The ubuntu service is not installed." +msgstr "ubuntu服务未安装" + +msgid "open ubuntu" +msgstr "打开ubuntu" + +msgid "stop ubuntu" +msgstr "停止ubuntu" + +msgid "run ubuntu" +msgstr "启动ubuntu" + +msgid "uninstall ubuntu" +msgstr "删除ubuntu" + +msgid "install ubuntu" +msgstr "安装ubuntu" + +msgid "Collecting data..." +msgstr "收集数据..." + +msgid "storage path" +msgstr "存储路径（建议插入U盘或硬盘，然后输入路径。例如：/mnt/sda1/ubuntu）" + +msgid "Storage path could not be empty!" +msgstr "存储路径不能为空！" diff --git a/applications/luci-app-ubuntu/root/etc/config/ubuntu b/applications/luci-app-ubuntu/root/etc/config/ubuntu new file mode 100644 index 0000000..6bec528 --- /dev/null +++ b/applications/luci-app-ubuntu/root/etc/config/ubuntu @@ -0,0 +1,4 @@ +config kodexplorer + option 'image' 'linkease/desktop-ubuntu-arm64:develop' + option 'password' 'password' + option 'port' '6901' diff --git a/applications/luci-app-ubuntu/root/opt/docker/jobs.json b/applications/luci-app-ubuntu/root/opt/docker/jobs.json new file mode 100644 index 0000000..a3d1a87 --- /dev/null +++ b/applications/luci-app-ubuntu/root/opt/docker/jobs.json @@ -0,0 +1 @@ +{"ignore_conditions": ["healthy"]} diff --git a/applications/luci-app-ubuntu/root/usr/share/ubuntu/install.sh b/applications/luci-app-ubuntu/root/usr/share/ubuntu/install.sh new file mode 100755 index 0000000..2eceb24 --- /dev/null +++ b/applications/luci-app-ubuntu/root/usr/share/ubuntu/install.sh @@ -0,0 +1,47 @@ +#!/bin/sh + +image_name=`uci get ubuntu.@ubuntu[0].image 2>/dev/null` + +[ -z "$image_name" ] && image_name="linkease/desktop-ubuntu-arm64:develop" + +install(){ + local password=`uci get ubuntu.@ubuntu[0].password 2>/dev/null` + local port=`uci get ubuntu.@ubuntu[0].port 2>/dev/null` + [ -z "$password" ] && password="password" + [ -z "$port" ] && port=6901 + + docker run -d --name ubuntu \ + --dns=223.5.5.5 -u=0:0 \ + -v=/mnt:/mnt:rslave \ + --net="docker-pcnet" \ + --ip=10.10.100.9 \ + --shm-size=512m \ + -p $port:6901 \ + -e VNC_PW=$password \ + -e VNC_USE_HTTP=0 \ + --restart unless-stopped \ + $image_name + +} + + +while getopts ":il" optname +do + case "$optname" in + "l") + echo -n $image_name + ;; + "i") + install + ;; + ":") + echo "No argument value for option $OPTARG" + ;; + "?") + echo "未知选项 $OPTARG" + ;; + *) + echo "Unknown error while processing options" + ;; + esac +done