From: Florian Eckert Date: Wed, 29 Jul 2020 07:06:04 +0000 (+0200) Subject: luci-app-dockerman: unify socket_path and hosts by adding the prefix unix:// X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=182c3012da75f00f68890afe70258b67d96a9f88;p=project%2Fluci.git luci-app-dockerman: unify socket_path and hosts by adding the prefix unix:// Signed-off-by: Florian Eckert --- diff --git a/applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua b/applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua index 6628ed0553..9ea006396a 100644 --- a/applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua +++ b/applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua @@ -723,7 +723,7 @@ elseif action == "console" then if remote and host and port then hosts = host .. ':'.. port elseif socket_path then - hosts = "unix://" .. socket_path + hosts = socket_path else 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 c2ed6b139f..f1fc4f0270 100644 --- a/applications/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua +++ b/applications/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua @@ -99,9 +99,8 @@ o.rmempty = false o = s:option(Value, "socket_path", translate("Docker Socket Path")) -o.default = "/var/run/docker.sock" -o.placeholder = "/var/run/docker.sock" -o.rmempty = false +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",