luci-app-dockerman: removal of the option socket_path

This option is for debug purposes only. It makes no sense to offer this
option to the user. Especially as it is not used for a remote
connection.

Signed-off-by: Florian Eckert <fe@dev.tdt.de>

diff --git a/applications/luci-app-dockerman/luasrc/controller/dockerman.lua b/applications/luci-app-dockerman/luasrc/controller/dockerman.lua
index 9167a896caf68b95944986844ac2cbdd3a6748f6..def685ce7c765327155c71bc5e4fb06fb083d14a 100644 (file)
--- a/applications/luci-app-dockerman/luasrc/controller/dockerman.lua
+++ b/applications/luci-app-dockerman/luasrc/controller/dockerman.lua
@@ -22,7 +22,7 @@ function index()
                        return
                end
        else
-               local socket = luci.model.uci.cursor():get("dockerd", "globals", "socket_path")
+               local socket = luci.model.uci.cursor():get("dockerd", "globals", "socket_path") or "/var/run/docker.sock"
                if socket and not nixio.fs.access(socket) then
                        return
                end

diff --git a/applications/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua b/applications/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua
index 59266ac49009d5357ff8082c5038aece10974832..7009c606024cd7c628566a090fb41aee399f8111 100644 (file)
--- a/applications/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua
+++ b/applications/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua
@@ -97,12 +97,6 @@ o = s:option(Flag, "remote_endpoint",
        translate("Connect to remote endpoint"))
 o.rmempty = false
 
-o = s:option(Value, "socket_path",
-       translate("Docker Socket Path"))
-o.default = "unix:///var/run/docker.sock"
-o.placeholder = "unix:///var/run/docker.sock"
-o:depends("remote_endpoint", 1)
-
 o = s:option(Value, "remote_host",
        translate("Remote Host"))
 o.placeholder = "10.1.1.2"