From 63c5cb56142d09c650dfabc873db55b598f09caa Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Thu, 8 Apr 2021 14:39:22 +0200 Subject: [PATCH] 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 --- .../luci-app-dockerman/luasrc/controller/dockerman.lua | 2 +- .../luasrc/model/cbi/dockerman/overview.lua | 6 ------ 2 files changed, 1 insertion(+), 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" -- 2.30.2