From 02c76f469c42ced16f4e3f073cbcd0b80254b267 Mon Sep 17 00:00:00 2001
From: CN_SZTL <cnsztl@gmail.com>
Date: Fri, 31 Jan 2020 02:41:43 +0800
Subject: [PATCH] luci-app-dockerman: sync with upstream source

---
 .../luasrc/model/cbi/docker/container.lua     | 19 ++++++++++++++++++-
 .../luasrc/model/cbi/docker/newcontainer.lua  |  2 +-
 .../luasrc/model/cbi/docker/volumes.lua       |  1 -
 .../luasrc/model/docker.lua                   |  2 +-
 .../luci-app-dockerman/po/zh-cn/dockerman.po  |  2 +-
 5 files changed, 21 insertions(+), 5 deletions(-)

diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua
index d9df1e6891..6e1f906fa4 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua
@@ -56,7 +56,24 @@ local get_mounts = function(d)
   local data
   if d.Mounts then
     for _,v in ipairs(d.Mounts) do
-      data = (data and (data .. "<br>") or "") .. v["Source"] .. ":" .. v["Destination"] .. (v["Mode"] ~= "" and (":" .. v["Mode"]) or "")
+      local v_sorce_d, v_dest_d
+      local v_sorce = ""
+      local v_dest = ""
+      for v_sorce_d in v["Source"]:gmatch('[^/]+') do
+        if v_sorce_d and #v_sorce_d > 12 then
+          v_sorce = v_sorce .. "/" .. v_sorce_d:sub(1,12) .. "..."
+        else
+          v_sorce = v_sorce .."/".. v_sorce_d
+        end
+      end
+      for v_dest_d in v["Destination"]:gmatch('[^/]+') do
+        if v_dest_d and #v_dest_d > 12 then
+          v_dest = v_dest .. "/" .. v_dest_d:sub(1,12) .. "..."
+        else
+          v_dest = v_dest .."/".. v_dest_d
+        end
+      end
+      data = (data and (data .. "<br>") or "") .. v_sorce .. ":" .. v["Destination"] .. (v["Mode"] ~= "" and (":" .. v["Mode"]) or "")
     end
   end
   return data
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 ba040b4b74..dbe5c6392b 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
@@ -416,7 +416,7 @@ m.handle = function(self, state, data)
     end
   end
 
-  create_body.Hostname = name
+  create_body.Hostname = network ~= "host" and name or nil
   create_body.Tty = tty and true or false
   create_body.OpenStdin = interactive and true or false
   create_body.User = user
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua
index b75e830630..f5e3281ade 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua
@@ -98,7 +98,6 @@ btnremove.write = function(self, section)
     -- 得到选中项的名字
     if volume_list[volume_table_sid]._selected == 1 then
       -- volume_selected[#volume_selected+1] = volume_id:cfgvalue(volume_table_sid)
-      luci.util.perror(volume_table_sid)
       volume_selected[#volume_selected+1] = volume_table_sid
     end
   end
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua
index 8a4095a741..9b24c044e2 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua
@@ -230,4 +230,4 @@ _docker.clear_status=function(self)
   nixio.fs.remove(self.options.status_path)
 end
 
-return _docker
+return _docker
\ No newline at end of file
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 fbcdc66476..a2bcb293aa 100644
--- a/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po
+++ b/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po
@@ -296,4 +296,4 @@ msgid "Pull Image"
 msgstr "拉取镜像"
 
 msgid "Pull"
-msgstr "拉取"
+msgstr "拉取"
\ No newline at end of file