zhao/luci-app-dockerman
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-dockerman: check for existing IPAM config

Browse Source 
This was added in upstream with 7292955a1b so should be fine for us to add it.

Signed-off-by: sbwml <admin@cooluc.com>
This commit is contained in:
sbwml 2024-04-02 18:28:44 +08:00
parent 70a3c24849
commit 44673977c8
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile
View File

@ -13,7 +13,7 @@ PKG_LICENSE:=AGPL-3.0
PKG_MAINTAINER:=lisaac <lisaac.cn@gmail.com> \
Florian Eckert <fe@dev.tdt.de>
PKG_VERSION:=v0.5.13-20230114
PKG_VERSION:=v0.5.13-20240317
include $(TOPDIR)/feeds/luci/luci.mk

4
luasrc/model/cbi/dockerman/networks.lua
View File

@ -38,8 +38,8 @@ local get_networks = function ()
data[index]["_interface"] = v.Options.parent
end
data[index]["_subnet"] = v.IPAM and v.IPAM.Config[1] and v.IPAM.Config[1].Subnet or nil
data[index]["_gateway"] = v.IPAM and v.IPAM.Config[1] and v.IPAM.Config[1].Gateway or nil
data[index]["_subnet"] = v.IPAM and v.IPAM.Config and v.IPAM.Config[1] and v.IPAM.Config[1].Subnet or nil
data[index]["_gateway"] = v.IPAM and v.IPAM.Config and v.IPAM.Config[1] and v.IPAM.Config[1].Gateway or nil
end
return data