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-26 23:56:53 +08:00
parent c55ed3ae4b
commit 45cefdaa9c
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
package/ctcgfw/luci-app-dockerman/Makefile
View File

@ -15,7 +15,7 @@ define Package/$(PKG_NAME)
SUBMENU:=3. Applications
TITLE:=Docker Manager interface for LuCI
PKGARCH:=all
DEPENDS:=+luci-lib-docker +luci-app-docker
DEPENDS:=+luci-lib-docker
endef
define Package/$(PKG_NAME)/description
@ -42,4 +42,4 @@ define Package/$(PKG_NAME)/install
po2lmo ./po/zh-cn/dockerman.po $(1)/usr/lib/lua/luci/i18n/dockerman.zh-cn.lmo
endef
$(eval $(call BuildPackage,$(PKG_NAME)))
$(eval $(call BuildPackage,$(PKG_NAME)))

4
package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua
View File

@ -113,7 +113,9 @@ elseif cmd_line and cmd_line:match("^duplicate/[^/]+$") then
default_config.interactive = create_body.OpenStdin and true or false
default_config.privileged = create_body.HostConfig.Privileged and true or false
default_config.restart = create_body.HostConfig.RestartPolicy and create_body.HostConfig.RestartPolicy.name or nil
default_config.network = create_body.HostConfig.NetworkMode == "default" and "bridge" or create_body.HostConfig.NetworkMode
-- default_config.network = create_body.HostConfig.NetworkMode == "default" and "bridge" or create_body.HostConfig.NetworkMode
-- if container has leave original network, and add new network, .HostConfig.NetworkMode is INcorrect, so using first child of .NetworkingConfig.EndpointsConfig
default_config.network = next(create_body.NetworkingConfig.EndpointsConfig)
default_config.ip = default_config.network and default_config.network ~= "bridge" and default_config.network ~= "host" and default_config.network ~= "null" and create_body.NetworkingConfig.EndpointsConfig[default_config.network].IPAMConfig and create_body.NetworkingConfig.EndpointsConfig[default_config.network].IPAMConfig.IPv4Address or nil
default_config.link = create_body.HostConfig.Links
default_config.env = create_body.Env