Nanako/openwrt-app-actions
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update ubuntu

Browse Source
This commit is contained in:
YGAS 2022-02-14 22:02:07 +08:00
parent cef7652431
commit 9a824685f0
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
applications/luci-app-ubuntu/luasrc/controller/ubuntu.lua
View File

@ -61,7 +61,6 @@ end
function install_container()
local image = util.exec("sh /usr/share/ubuntu/install.sh -l")
local docker_on_disk = tonumber(util.exec("sh /usr/share/ubuntu/install.sh -c"))
local password = luci.http.formvalue("password")
local port = luci.http.formvalue("port")
@ -74,6 +73,7 @@ function install_container()
})
uci:save(keyword)
uci:commit(keyword)
local image = util.exec("sh /usr/share/ubuntu/install.sh -l")
local pull_image = function(image)
docker:append_status("Images: " .. "pulling" .. " " .. image .. "...\n")

2
applications/luci-app-ubuntu/root/etc/config/ubuntu
View File

@ -1,5 +1,5 @@
config ubuntu
option 'image' 'linkease/desktop-ubuntu-arm64:develop'
option 'image' 'linkease/desktop-ubuntu-standard-arm64:latest'
option 'password' 'password'
option 'port' '6901'
option 'version' 'standard'

18
applications/luci-app-ubuntu/root/usr/share/ubuntu/install.sh
View File

@ -13,21 +13,24 @@ image_name=`uci get ubuntu.@ubuntu[0].image 2>/dev/null`
DOCKERPATH=`uci get dockerman.local.daemon_data_root`
result=`findmnt -T $DOCKERPATH | grep -c /dev/sd`
install(){
local password=`uci get ubuntu.@ubuntu[0].password 2>/dev/null`
local port=`uci get ubuntu.@ubuntu[0].port 2>/dev/null`
get_image(){
local version=`uci get ubuntu.@ubuntu[0].version 2>/dev/null`
[ -z "$password" ] && password="password"
[ -z "$port" ] && port=6901
if [ "${version}" == "full"];then
if [ "${version}" == "full" ];then
image_name="linkease/desktop-ubuntu-full-arm64:latest"
fi
if [ "${version}" == "standard"];then
if [ "${version}" == "standard" ];then
image_name="linkease/desktop-ubuntu-standard-arm64:latest"
fi
}
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
get_image
docker network ls -f "name=docker-pcnet" | grep -q docker-pcnet || \
docker network create -d bridge --subnet=10.10.100.0/24 --ip-range=10.10.100.0/24 --gateway=10.10.100.1 docker-pcnet
@ -49,6 +52,7 @@ while getopts ":ilc" optname
do
case "$optname" in
"l")
get_image
echo -n $image_name
;;
"i")