diff --git a/package/ctcgfw/luci-app-dockerman/Makefile b/package/ctcgfw/luci-app-dockerman/Makefile index bd1178091a..f688065b49 100644 --- a/package/ctcgfw/luci-app-dockerman/Makefile +++ b/package/ctcgfw/luci-app-dockerman/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-dockerman -PKG_VERSION:=v0.1.8 +PKG_VERSION:=v0.1.9 PKG_RELEASE:=beta PKG_MAINTAINER:=lisaac PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME) @@ -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))) \ No newline at end of file +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua index 20db2880de..8a4095a741 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua @@ -93,7 +93,7 @@ local get_config = function(old_config, old_host_config, old_network_setting, im if config.User == image_config.User then config.User = "" end if table_equal(config.Cmd, image_config.Cmd) then config.Cmd = nil end if table_equal(config.Entrypoint, image_config.Entrypoint) then config.Entrypoint = nil end - + if table_equal(config.ExposedPorts, image_config.ExposedPorts) then config.ExposedPorts = nil end config.Env = table_subtract(config.Env, image_config.Env) config.Labels = table_subtract(config.Labels, image_config.Labels) config.Volumes = map_subtract(config.Volumes, image_config.Volumes) @@ -230,4 +230,4 @@ _docker.clear_status=function(self) nixio.fs.remove(self.options.status_path) end -return _docker \ No newline at end of file +return _docker diff --git a/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po b/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po index 701db58ad9..fbcdc66476 100644 --- a/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po +++ b/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po @@ -23,7 +23,7 @@ msgid "Restart" msgstr "重启" msgid "Stop" -msgstr "关闭" +msgstr "停止" msgid "Upgrade" msgstr "升级容器" @@ -296,4 +296,4 @@ msgid "Pull Image" msgstr "拉取镜像" msgid "Pull" -msgstr "拉取" \ No newline at end of file +msgstr "拉取"