luci-app-dockerman: model/docker update coding style
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
This commit is contained in:
Florian Eckert
parent
7e4f4ca558
commit
2b2620f890
1 changed files with 377 additions and 307 deletions
|
|
@ -3,7 +3,6 @@ LuCI - Lua Configuration Interface
|
|||
Copyright 2019 lisaac <https://github.com/lisaac/luci-app-dockerman>
|
||||
]]--
|
||||
|
||||
require "luci.util"
|
||||
local docker = require "luci.docker"
|
||||
local uci = (require "luci.model.uci").cursor()
|
||||
|
||||
|
|
@ -14,28 +13,48 @@ local update_image = function(self, image_name)
|
|||
local json_stringify = luci.jsonc and luci.jsonc.stringify
|
||||
_docker:append_status("Images: " .. "pulling" .. " " .. image_name .. "...\n")
|
||||
local res = self.images:create({query = {fromImage=image_name}}, _docker.pull_image_show_status_cb)
|
||||
|
||||
if res and res.code == 200 and (#res.body > 0 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_name)) then
|
||||
_docker:append_status("done\n")
|
||||
else
|
||||
res.body.message = res.body[#res.body] and res.body[#res.body].error or (res.body.message or res.message)
|
||||
end
|
||||
|
||||
new_image_id = self.images:inspect({name = image_name}).body.Id
|
||||
return new_image_id, res
|
||||
end
|
||||
|
||||
local table_equal = function(t1, t2)
|
||||
if not t1 then return true end
|
||||
if not t2 then return false end
|
||||
if #t1 ~= #t2 then return false end
|
||||
for i, v in ipairs(t1) do
|
||||
if t1[i] ~= t2[i] then return false end
|
||||
if not t1 then
|
||||
return true
|
||||
end
|
||||
|
||||
if not t2 then
|
||||
return false
|
||||
end
|
||||
|
||||
if #t1 ~= #t2 then
|
||||
return false
|
||||
end
|
||||
|
||||
for i, v in ipairs(t1) do
|
||||
if t1[i] ~= t2[i] then
|
||||
return false
|
||||
end
|
||||
end
|
||||
|
||||
return true
|
||||
end
|
||||
|
||||
local table_subtract = function(t1, t2)
|
||||
if not t1 or next(t1) == nil then return nil end
|
||||
if not t2 or next(t2) == nil then return t1 end
|
||||
if not t1 or next(t1) == nil then
|
||||
return nil
|
||||
end
|
||||
|
||||
if not t2 or next(t2) == nil then
|
||||
return t1
|
||||
end
|
||||
|
||||
local res = {}
|
||||
for _, v1 in ipairs(t1) do
|
||||
local found = false
|
||||
|
|
@ -49,12 +68,19 @@ local table_subtract = function(t1, t2)
|
|||
table.insert(res, v1)
|
||||
end
|
||||
end
|
||||
|
||||
return next(res) == nil and nil or res
|
||||
end
|
||||
|
||||
local map_subtract = function(t1, t2)
|
||||
if not t1 or next(t1) == nil then return nil end
|
||||
if not t2 or next(t2) == nil then return t1 end
|
||||
if not t1 or next(t1) == nil then
|
||||
return nil
|
||||
end
|
||||
|
||||
if not t2 or next(t2) == nil then
|
||||
return t1
|
||||
end
|
||||
|
||||
local res = {}
|
||||
for k1, v1 in pairs(t1) do
|
||||
local found = false
|
||||
|
|
@ -64,15 +90,9 @@ local map_subtract = function(t1, t2)
|
|||
break
|
||||
end
|
||||
end
|
||||
|
||||
if not found then
|
||||
res[k1] = v1
|
||||
-- if v1 and type(v1) == "table" then
|
||||
-- if next(v1) == nil then
|
||||
-- res[k1] = { k = 'v' }
|
||||
-- else
|
||||
-- res[k1] = v1
|
||||
-- end
|
||||
-- end
|
||||
end
|
||||
end
|
||||
|
||||
|
|
@ -81,6 +101,7 @@ end
|
|||
|
||||
_docker.clear_empty_tables = function ( t )
|
||||
local k, v
|
||||
|
||||
if next(t) == nil then
|
||||
t = nil
|
||||
else
|
||||
|
|
@ -90,23 +111,39 @@ _docker.clear_empty_tables = function ( t )
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
return t
|
||||
end
|
||||
|
||||
-- return create_body, extra_network
|
||||
local get_config = function(container_config, image_config)
|
||||
local config = container_config.Config
|
||||
local old_host_config = container_config.HostConfig
|
||||
local old_network_setting = container_config.NetworkSettings.Networks or {}
|
||||
if config.WorkingDir == image_config.WorkingDir then config.WorkingDir = "" end
|
||||
if config.User == image_config.User then config.User = "" end
|
||||
if table_equal(config.Cmd, image_config.Cmd) then config.Cmd = nil end
|
||||
if table_equal(config.Entrypoint, image_config.Entrypoint) then config.Entrypoint = nil end
|
||||
if table_equal(config.ExposedPorts, image_config.ExposedPorts) then config.ExposedPorts = nil end
|
||||
|
||||
if config.WorkingDir == image_config.WorkingDir then
|
||||
config.WorkingDir = ""
|
||||
end
|
||||
|
||||
if config.User == image_config.User then
|
||||
config.User = ""
|
||||
end
|
||||
|
||||
if table_equal(config.Cmd, image_config.Cmd) then
|
||||
config.Cmd = nil
|
||||
end
|
||||
|
||||
if table_equal(config.Entrypoint, image_config.Entrypoint) then
|
||||
config.Entrypoint = nil
|
||||
end
|
||||
|
||||
if table_equal(config.ExposedPorts, image_config.ExposedPorts) then
|
||||
config.ExposedPorts = nil
|
||||
end
|
||||
|
||||
config.Env = table_subtract(config.Env, image_config.Env)
|
||||
config.Labels = table_subtract(config.Labels, image_config.Labels)
|
||||
config.Volumes = map_subtract(config.Volumes, image_config.Volumes)
|
||||
-- subtract ports exposed in image from container
|
||||
|
||||
if old_host_config.PortBindings and next(old_host_config.PortBindings) ~= nil then
|
||||
config.ExposedPorts = {}
|
||||
for p, v in pairs(old_host_config.PortBindings) do
|
||||
|
|
@ -114,10 +151,10 @@ local get_config = function(container_config, image_config)
|
|||
end
|
||||
end
|
||||
|
||||
-- handle network config, we need only one network, extras need to network connect action
|
||||
local network_setting = {}
|
||||
local multi_network = false
|
||||
local extra_network = {}
|
||||
|
||||
for k, v in pairs(old_network_setting) do
|
||||
if multi_network then
|
||||
extra_network[k] = v
|
||||
|
|
@ -127,12 +164,8 @@ local get_config = function(container_config, image_config)
|
|||
multi_network = true
|
||||
end
|
||||
|
||||
-- handle hostconfig
|
||||
local host_config = old_host_config
|
||||
-- if host_config.PortBindings and next(host_config.PortBindings) == nil then host_config.PortBindings = nil end
|
||||
-- host_config.LogConfig = nil
|
||||
host_config.Mounts = {}
|
||||
-- for volumes
|
||||
for i, v in ipairs(container_config.Mounts) do
|
||||
if v.Type == "volume" then
|
||||
table.insert(host_config.Mounts, {
|
||||
|
|
@ -145,30 +178,37 @@ local get_config = function(container_config, image_config)
|
|||
end
|
||||
end
|
||||
|
||||
|
||||
-- merge configs
|
||||
local create_body = config
|
||||
create_body["HostConfig"] = host_config
|
||||
create_body["NetworkingConfig"] = {EndpointsConfig = network_setting}
|
||||
create_body = _docker.clear_empty_tables(create_body) or {}
|
||||
extra_network = _docker.clear_empty_tables(extra_network) or {}
|
||||
|
||||
return create_body, extra_network
|
||||
end
|
||||
|
||||
local upgrade = function(self, request)
|
||||
_docker:clear_status()
|
||||
-- get image name, image id, container name, configuration information
|
||||
|
||||
local container_info = self.containers:inspect({id = request.id})
|
||||
|
||||
if container_info.code > 300 and type(container_info.body) == "table" then
|
||||
return container_info
|
||||
end
|
||||
|
||||
local image_name = container_info.body.Config.Image
|
||||
if not image_name:match(".-:.+") then image_name = image_name .. ":latest" end
|
||||
if not image_name:match(".-:.+") then
|
||||
image_name = image_name .. ":latest"
|
||||
end
|
||||
|
||||
local old_image_id = container_info.body.Image
|
||||
local container_name = container_info.body.Name:sub(2)
|
||||
|
||||
local image_id, res = update_image(self, image_name)
|
||||
if res and res.code ~= 200 then return res end
|
||||
if res and res.code ~= 200 then
|
||||
return res
|
||||
end
|
||||
|
||||
if image_id == old_image_id then
|
||||
return {code = 305, body = {message = "Already up to date"}}
|
||||
end
|
||||
|
|
@ -189,7 +229,6 @@ local upgrade = function(self, request)
|
|||
return res
|
||||
end
|
||||
|
||||
-- handle config
|
||||
local image_config = self.images:inspect({id = old_image_id}).body.Config
|
||||
local create_body, extra_network = get_config(container_info.body, image_config)
|
||||
|
||||
|
|
@ -197,31 +236,40 @@ local upgrade = function(self, request)
|
|||
_docker:append_status("Container: Create" .. " " .. container_name .. "...")
|
||||
create_body = _docker.clear_empty_tables(create_body)
|
||||
res = self.containers:create({name = container_name, body = create_body})
|
||||
if res and res.code > 300 then return res end
|
||||
if res and res.code > 300 then
|
||||
return res
|
||||
end
|
||||
_docker:append_status("done\n")
|
||||
|
||||
-- extra networks need to network connect action
|
||||
for k, v in pairs(extra_network) do
|
||||
_docker:append_status("Networks: Connect" .. " " .. container_name .. "...")
|
||||
res = self.networks:connect({id = k, body = {Container = container_name, EndpointConfig = v}})
|
||||
if res.code > 300 then return res end
|
||||
|
||||
if res.code > 300 then
|
||||
return res
|
||||
end
|
||||
_docker:append_status("done\n")
|
||||
end
|
||||
|
||||
_docker:clear_status()
|
||||
return res
|
||||
end
|
||||
|
||||
local duplicate_config = function (self, request)
|
||||
local container_info = self.containers:inspect({id = request.id})
|
||||
if container_info.code > 300 and type(container_info.body) == "table" then return nil end
|
||||
if container_info.code > 300 and type(container_info.body) == "table" then
|
||||
return nil
|
||||
end
|
||||
|
||||
local old_image_id = container_info.body.Image
|
||||
local image_config = self.images:inspect({id = old_image_id}).body.Config
|
||||
|
||||
return get_config(container_info.body, image_config)
|
||||
end
|
||||
|
||||
_docker.new = function(option)
|
||||
local option = option or {}
|
||||
|
||||
local remote = uci:get("dockerd", "globals", "remote_endpoint")
|
||||
options = {
|
||||
host = (remote == "true") and (option.host or uci:get("dockerd", "globals", "remote_host")) or nil,
|
||||
|
|
@ -229,25 +277,33 @@ _docker.new = function(option)
|
|||
debug = option.debug or uci:get("dockerd", "globals", "debug") == 'true' and true or false,
|
||||
debug_path = option.debug_path or uci:get("dockerd", "globals", "debug_path") or "/tmp/.docker_debug"
|
||||
}
|
||||
|
||||
options.socket_path = (remote ~= "true" or not options.host or not options.port) and (option.socket_path or uci:get("dockerd", "globals", "socket_path") or "/var/run/docker.sock") or nil
|
||||
|
||||
local _new = docker.new(options)
|
||||
_new.options.status_path = uci:get("dockerd", "globals", "status_path") or "/tmp/.docker_status"
|
||||
_new.containers_upgrade = upgrade
|
||||
_new.containers_duplicate_config = duplicate_config
|
||||
|
||||
return _new
|
||||
end
|
||||
|
||||
_docker.options={}
|
||||
_docker.options.status_path = uci:get("dockerd", "globals", "status_path") or "/tmp/.docker_status"
|
||||
|
||||
_docker.append_status=function(self,val)
|
||||
if not val then return end
|
||||
if not val then
|
||||
return
|
||||
end
|
||||
local file_docker_action_status=io.open(self.options.status_path, "a+")
|
||||
file_docker_action_status:write(val)
|
||||
file_docker_action_status:close()
|
||||
end
|
||||
|
||||
_docker.write_status=function(self,val)
|
||||
if not val then return end
|
||||
if not val then
|
||||
return
|
||||
end
|
||||
local file_docker_action_status=io.open(self.options.status_path, "w+")
|
||||
file_docker_action_status:write(val)
|
||||
file_docker_action_status:close()
|
||||
|
|
@ -291,7 +347,9 @@ _docker.pull_image_show_status_cb = function(res, source)
|
|||
local buf = _docker:read_status()
|
||||
local num = 0
|
||||
local str = '\t' .. (step.id and (step.id .. ": ") or "") .. (step.status and step.status or "") .. (step.progress and (" " .. step.progress) or "").."\n"
|
||||
if step.id then buf, num = buf:gsub("\t"..step.id .. ": .-\n", str) end
|
||||
if step.id then
|
||||
buf, num = buf:gsub("\t"..step.id .. ": .-\n", str)
|
||||
end
|
||||
if num == 0 then
|
||||
buf = buf .. str
|
||||
end
|
||||
|
|
@ -311,31 +369,32 @@ _docker.import_image_show_status_cb = function(res, source)
|
|||
local buf = _docker:read_status()
|
||||
local num = 0
|
||||
local str = '\t' .. (step.status and step.status or "") .. (step.progress and (" " .. step.progress) or "").."\n"
|
||||
if step.status then buf, num = buf:gsub("\t"..step.status .. " .-\n", str) end
|
||||
if step.status then
|
||||
buf, num = buf:gsub("\t"..step.status .. " .-\n", str)
|
||||
end
|
||||
if num == 0 then
|
||||
buf = buf .. str
|
||||
end
|
||||
_docker:write_status(buf)
|
||||
end
|
||||
end
|
||||
)
|
||||
end)
|
||||
end
|
||||
|
||||
-- _docker.print_status_cb = function(res, source)
|
||||
-- return status_cb(res, source, function(step)
|
||||
-- luci.util.perror(step)
|
||||
-- end
|
||||
-- )
|
||||
-- end
|
||||
|
||||
_docker.create_macvlan_interface = function(name, device, gateway, subnet)
|
||||
if not nixio.fs.access("/etc/config/network") or not nixio.fs.access("/etc/config/firewall") then return end
|
||||
if uci:get("dockerd", "globals", "remote_endpoint") == "true" then return end
|
||||
if not nixio.fs.access("/etc/config/network") or not nixio.fs.access("/etc/config/firewall") then
|
||||
return
|
||||
end
|
||||
|
||||
if uci:get("dockerd", "globals", "remote_endpoint") == "true" then
|
||||
return
|
||||
end
|
||||
|
||||
local ip = require "luci.ip"
|
||||
local if_name = "docker_"..name
|
||||
local dev_name = "macvlan_"..name
|
||||
local net_mask = tostring(ip.new(subnet):mask())
|
||||
local lan_interfaces
|
||||
|
||||
-- add macvlan device
|
||||
uci:delete("network", dev_name)
|
||||
uci:set("network", dev_name, "device")
|
||||
|
|
@ -343,6 +402,7 @@ _docker.create_macvlan_interface = function(name, device, gateway, subnet)
|
|||
uci:set("network", dev_name, "ifname", device)
|
||||
uci:set("network", dev_name, "type", "macvlan")
|
||||
uci:set("network", dev_name, "mode", "bridge")
|
||||
|
||||
-- add macvlan interface
|
||||
uci:delete("network", if_name)
|
||||
uci:set("network", if_name, "interface")
|
||||
|
|
@ -364,14 +424,22 @@ _docker.create_macvlan_interface = function(name, device, gateway, subnet)
|
|||
uci:set("firewall", s[".name"], "network", interfaces)
|
||||
end
|
||||
end)
|
||||
|
||||
uci:commit("firewall")
|
||||
uci:commit("network")
|
||||
|
||||
os.execute("ifup " .. if_name)
|
||||
end
|
||||
|
||||
_docker.remove_macvlan_interface = function(name)
|
||||
if not nixio.fs.access("/etc/config/network") or not nixio.fs.access("/etc/config/firewall") then return end
|
||||
if uci:get("dockerd", "globals", "remote_endpoint") == "true" then return end
|
||||
if not nixio.fs.access("/etc/config/network") or not nixio.fs.access("/etc/config/firewall") then
|
||||
return
|
||||
end
|
||||
|
||||
if uci:get("dockerd", "globals", "remote_endpoint") == "true" then
|
||||
return
|
||||
end
|
||||
|
||||
local if_name = "docker_"..name
|
||||
local dev_name = "macvlan_"..name
|
||||
uci:foreach("firewall", "zone", function(s)
|
||||
|
|
@ -387,10 +455,12 @@ _docker.remove_macvlan_interface = function(name)
|
|||
uci:set("firewall", s[".name"], "network", interfaces)
|
||||
end
|
||||
end)
|
||||
uci:commit("firewall")
|
||||
|
||||
uci:delete("network", dev_name)
|
||||
uci:delete("network", if_name)
|
||||
uci:commit("network")
|
||||
uci:commit("firewall")
|
||||
|
||||
os.execute("ip link del " .. if_name)
|
||||
end
|
||||
|
||||
|
|
|
|||
Loading…
Reference in a new issue