diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua index d4c161195a..5755d16ae0 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua @@ -115,7 +115,7 @@ local start_stop_remove = function(m, cmd) end end -m=SimpleForm("docker", container_info.Name:sub(2), translate("Docker Contaienr") ) +m=SimpleForm("docker", container_info.Name:sub(2), translate("Docker Container") ) m.template = "docker/cbi/xsimpleform" m.redirect = luci.dispatcher.build_url("admin/docker/containers") -- m:append(Template("docker/container")) diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua index f9e46fbdeb..b3c061c9ff 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua @@ -328,7 +328,7 @@ m.handle = function(self, state, data) local interactive = type(data.interactive) == "number" and (data.interactive == 1 and true or false) or default_config.interactive or false local image = data.image local user = data.user - if not image:match(".-:.+") then + if image and not image:match(".-:.+") then image = image .. ":latest" end local privileged = type(data.privileged) == "number" and (data.privileged == 1 and true or false) or default_config.privileged or false diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua index 1fcd8672ea..32983f54b8 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua @@ -150,17 +150,20 @@ m.handle = function(self, state, data) Internal = internal } - if subnet or gateway or ip_range or next(aux_address)~=nil then + if subnet or gateway or ip_range then create_body["IPAM"]["Config"] = { { Subnet = subnet, Gateway = gateway, IPRange = ip_range, -- AuxAddress = aux_address - AuxiliaryAddresses = aux_address + -- AuxiliaryAddresses = aux_address } } end + if next(aux_address)~=nil then + create_body["IPAM"]["Config"]["AuxiliaryAddresses"] = aux_address + end if driver == "macvlan" then create_body["IPAM"]["Options"] = { macvlan_mode = data.macvlan_mode,