diff options
| author | Florian Eckert <fe@dev.tdt.de> | 2020-07-29 09:06:04 +0200 |
|---|---|---|
| committer | Florian Eckert <fe@dev.tdt.de> | 2020-07-29 09:10:50 +0200 |
| commit | 182c3012da75f00f68890afe70258b67d96a9f88 (patch) | |
| tree | 0bb535958bcd7782964883080f86191d0c9d3986 /applications | |
| parent | c19a7d18e5b3c2d17480502086af6d8a8287d39a (diff) | |
luci-app-dockerman: unify socket_path and hosts by adding the prefix unix://
Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Diffstat (limited to 'applications')
| -rw-r--r-- | applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua | 2 | ||||
| -rw-r--r-- | applications/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua | 5 |
2 files changed, 3 insertions, 4 deletions
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 6628ed055..9ea006396 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 c2ed6b139..f1fc4f027 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", |