summaryrefslogtreecommitdiffhomepage
path: root/applications/luci-app-dockerman/root/usr/share
diff options
context:
space:
mode:
authorFlorian Eckert <fe@dev.tdt.de>2020-06-22 10:34:27 +0200
committerFlorian Eckert <fe@dev.tdt.de>2020-07-28 14:16:14 +0200
commit1803f7e5253e8d3b7057f2ba11d8164408b7156e (patch)
tree8c18ca144c473efd6fef31ec82cb4b2d00f83f0b /applications/luci-app-dockerman/root/usr/share
parentc72d67a57fe828f639db6ff6954e058700f6fdc6 (diff)
luci-app-dockerman: remove init.d dockerman
The configuration is now done in the docker-ce package. Signed-off-by: Florian Eckert <fe@dev.tdt.de>
Diffstat (limited to 'applications/luci-app-dockerman/root/usr/share')
-rw-r--r--applications/luci-app-dockerman/root/usr/share/dockerman/dockerd-ac.lua20
-rw-r--r--applications/luci-app-dockerman/root/usr/share/dockerman/dockerd-config.lua52
2 files changed, 0 insertions, 72 deletions
diff --git a/applications/luci-app-dockerman/root/usr/share/dockerman/dockerd-ac.lua b/applications/luci-app-dockerman/root/usr/share/dockerman/dockerd-ac.lua
deleted file mode 100644
index e8a2c0b7eb..0000000000
--- a/applications/luci-app-dockerman/root/usr/share/dockerman/dockerd-ac.lua
+++ /dev/null
@@ -1,20 +0,0 @@
-require "luci.util"
-docker = require "luci.docker"
-uci = (require "luci.model.uci").cursor()
-dk = docker.new({socket_path = "/var/run/docker.sock"})
-
-if dk:_ping().code ~= 200 then return end
-containers_list = dk.containers:list({query = {all=true}}).body
-allowed_container = uci:get("dockerman", "local", "ac_allowed_container")
-
-if not allowed_container or next(allowed_container)==nil then return end
-allowed_ip = {}
-for i, v in ipairs(containers_list) do
- for ii, vv in ipairs(allowed_container) do
- if v.Id:sub(1,12) == vv and v.NetworkSettings and v.NetworkSettings.Networks and v.NetworkSettings.Networks.bridge and v.NetworkSettings.Networks.bridge.IPAddress then
- print(v.NetworkSettings.Networks.bridge.IPAddress)
- luci.util.exec("iptables -I DOCKER-MAN -d "..v.NetworkSettings.Networks.bridge.IPAddress.." -o docker0 -j RETURN")
- table.remove(allowed_container, ii)
- end
- end
-end
diff --git a/applications/luci-app-dockerman/root/usr/share/dockerman/dockerd-config.lua b/applications/luci-app-dockerman/root/usr/share/dockerman/dockerd-config.lua
deleted file mode 100644
index 179868869b..0000000000
--- a/applications/luci-app-dockerman/root/usr/share/dockerman/dockerd-config.lua
+++ /dev/null
@@ -1,52 +0,0 @@
-require "luci.util"
-fs = require "nixio.fs"
-uci = (require "luci.model.uci").cursor()
-
-raw_file_dir = arg[1]
-
-raw_json_str = fs.readfile(raw_file_dir) or "[]"
-raw_json = luci.jsonc.parse(raw_json_str) or {}
-
-new_json = {}
-new_json["data-root"] = uci:get("dockerman", "local", "daemon_data_root")
-new_json["hosts"] = uci:get("dockerman", "local", "daemon_hosts") or {}
-new_json["registry-mirrors"] = uci:get("dockerman", "local", "daemon_registry_mirrors") or {}
-new_json["log-level"] = uci:get("dockerman", "local", "daemon_log_level")
-
-function comp(raw, new)
- for k, v in pairs(new) do
- if type(v) == "table" and raw[k] then
- if #v == #raw[k] then
- comp(raw[k], v)
- else
- changed = true
- raw[k] = v
- end
- elseif raw[k] ~= v then
- changed = true
- raw[k] = v
- end
- end
- for k, v in ipairs(new) do
- if type(v) == "table" and raw[k] then
- if #v == #raw[k] then
- comp(raw[k], v)
- else
- changed = true
- raw[k] = v
- end
- elseif raw[k] ~= v then
- changed = true
- raw[k] = v
- end
- end
-end
-comp(raw_json, new_json)
-if changed then
- if next(raw_json["registry-mirrors"]) == nil then raw_json["registry-mirrors"] = nil end
- if next(raw_json["hosts"]) == nil then raw_json["hosts"] = nil end
- fs.writefile(raw_file_dir, luci.jsonc.stringify(raw_json, true):gsub("\\", ""))
- os.exit(0)
-else
- os.exit(1)
-end