From c4f3ac05288ba148fcd5c0222f34f393dbec57a2 Mon Sep 17 00:00:00 2001 From: Florian Eckert Date: Wed, 21 Apr 2021 22:56:50 +0200 Subject: [PATCH] luci-app-dockerman: Carelessness fixed during branch rebasing Signed-off-by: Florian Eckert --- .../luasrc/model/cbi/dockerman/overview.lua | 59 ------------------- 1 file changed, 59 deletions(-) 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 3c2b80a236..dd4828b34f 100644 --- a/applications/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua +++ b/applications/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua @@ -87,63 +87,4 @@ if docker.new():_ping().code == 200 then s.volumes_total = tostring(#volumes_list) end -<<<<<<< HEAD -======= -s = m:section(NamedSection, "globals", "section", translate("Setting")) - -o = s:option(Flag, "remote_endpoint", - translate("Remote Endpoint"), - translate("Connect to remote endpoint")) -o.rmempty = false - -o = s:option(Value, "remote_host", - translate("Remote Host")) -o.placeholder = "10.1.1.2" -o:depends("remote_endpoint", 1) - -o = s:option(Value, "remote_port", - translate("Remote Port")) -o.placeholder = "2375" -o.default = "2375" -o:depends("remote_endpoint", 1) - -if nixio.fs.access("/usr/bin/dockerd") then - o = s:option(Value, "data_root", - translate("Docker Root Dir")) - o.placeholder = "/opt/docker/" - o:depends("remote_endpoint", 0) - - o = s:option(Value, "bip", - translate("Default bridge"), - translate("Configure the default bridge network")) - o.placeholder = "172.17.0.1/16" - o.datatype = "ipaddr" - o:depends("remote_endpoint", 0) - - o = s:option(DynamicList, "registry_mirrors", - translate("Registry Mirrors"), - translate("It replaces the daemon registry mirrors with a new set of registry mirrors")) - o.placeholder = translate("Example: https://hub-mirror.c.163.com") - o:depends("remote_endpoint", 0) - - o = s:option(ListValue, "log_level", - translate("Log Level"), - translate('Set the logging level')) - o:value("debug", "debug") - o:value("info", "info") - o:value("warn", "warn") - o:value("error", "error") - o:value("fatal", "fatal") - o:depends("remote_endpoint", 0) - - o = s:option(DynamicList, "hosts", - translate("Client connection"), - translate('Specifies where the Docker daemon will listen for client connections')) - o:value("unix:///var/run/docker.sock", "unix:///var/run/docker.sock") - o:value("tcp://0.0.0.0:2375", "tcp://0.0.0.0:2375") - o.rmempty = true - o:depends("remote_endpoint", 0) -end - ->>>>>>> ec564ddf6... luci-app-dockerman: set examle registry url as placeholder return m -- 2.30.2