fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-dockerman: sync with upstream source

Browse Source
This commit is contained in:
CN_SZTL 2020-01-23 22:38:43 +08:00
parent b198109009
commit 9447ef2658
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua
View File

@ -165,12 +165,12 @@ m.handle = function(self, state, data)
create_body["IPAM"]["Config"]["AuxiliaryAddresses"] = aux_address
end
if driver == "macvlan" then
create_body["IPAM"]["Options"] = {
create_body["Options"] = {
macvlan_mode = data.macvlan_mode,
parent = data.parent
}
elseif driver == "ipvlan" then
create_body["IPAM"]["Options"] = {
create_body["Options"] = {
ipvlan_mode = data.ipvlan_mode
}
elseif driver == "overlay" then
@ -188,8 +188,11 @@ m.handle = function(self, state, data)
}
end
if next(options) ~= nil then
create_body["Options"] = options
if next(options) ~= nil then
create_body["Options"] = create_body["Options"] or {}
for k, v in pairs(options) do
create_body["Options"][k] = v
end
end
docker:append_status("Network: " .. "create" .. " " .. create_body.Name .. "...")