summaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--applications/luci-app-dockerman/luasrc/controller/dockerman.lua2
-rw-r--r--applications/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua6
2 files changed, 1 insertions, 7 deletions
diff --git a/applications/luci-app-dockerman/luasrc/controller/dockerman.lua b/applications/luci-app-dockerman/luasrc/controller/dockerman.lua
index 9167a896ca..def685ce7c 100644
--- 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 59266ac490..7009c60602 100644
--- 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"