From 45cefdaa9c3eaf07b631211b5d91c799ee45e555 Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sun, 26 Jan 2020 23:56:53 +0800 Subject: [PATCH] luci-app-dockerman: sync with upstream source --- package/ctcgfw/luci-app-dockerman/Makefile | 4 ++-- .../luasrc/model/cbi/docker/newcontainer.lua | 4 +++- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/package/ctcgfw/luci-app-dockerman/Makefile b/package/ctcgfw/luci-app-dockerman/Makefile index 6cc61946b9..bd1178091a 100644 --- a/package/ctcgfw/luci-app-dockerman/Makefile +++ b/package/ctcgfw/luci-app-dockerman/Makefile @@ -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))) \ No newline at end of file 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 18684a442b..c3f468dc9f 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 @@ -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