>
+<%
+ local vals = self:cfgvalue(section) or self.default or {}
+ for i=1, #vals + 1 do
+ local val = vals[i]
+ if (val and #val > 0) or (i == 1) then
+%>
+
@@ -19,7 +21,7 @@
formData.append('tag', valITag.value)
let xhr = new XMLHttpRequest()
uci_confirm_docker()
- xhr.open("POST", "<%=url('admin/docker/images_import')%>", true)
+ xhr.open("POST", "<%=url('admin/services/docker/images_import')%>", true)
xhr.onload = function () {
location.reload()
}
@@ -40,7 +42,7 @@
formData.append('upload-archive', fileimport.files[0])
let xhr = new XMLHttpRequest()
uci_confirm_docker()
- xhr.open("POST", "<%=url('admin/docker/images_import')%>", true)
+ xhr.open("POST", "<%=url('admin/services/docker/images_import')%>", true)
xhr.onload = function () {
fileimport.value = ''
location.reload()
@@ -51,7 +53,7 @@
let new_tag = function (image_id) {
let new_tag = prompt("<%:New tag%>\n<%:Image%>" + "ID: " + image_id + "\n<%:Please input new tag%>:", "")
if (new_tag) {
- (new XHR()).post("<%=url('admin/docker/images_tag')%>",
+ (new XHR()).post("<%=url('admin/services/docker/images_tag')%>",
{ id: image_id, tag: new_tag },
function (r) {
if (r.status == 201) {
@@ -70,7 +72,7 @@
let un_tag = function (tag) {
if (tag.match("")) return
if (confirm("<%:Remove tag%>: " + tag + " ?")) {
- (new XHR()).post("<%=url('admin/docker/images_untag')%>",
+ (new XHR()).post("<%=url('admin/services/docker/images_untag')%>",
{ tag: tag },
function (r) {
if (r.status == 200) {
@@ -85,4 +87,4 @@
})
}
}
-
\ No newline at end of file
+
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/images_load.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/images_load.htm
index 51a2e39cbe..043b60d8d5 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/images_load.htm
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/images_load.htm
@@ -20,7 +20,7 @@
formData.append('upload-archive', fileLoad.files[0])
let xhr = new XMLHttpRequest()
uci_confirm_docker()
- xhr.open("POST", "/cgi-bin/luci/admin/docker/images_load", true)
+ xhr.open("POST", "/cgi-bin/luci/admin/services/docker/images_load", true)
xhr.onload = function() {
location.reload()
}
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/logs.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/logs.htm
index c9035daf7c..8e94cad42d 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/logs.htm
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/logs.htm
@@ -8,4 +8,4 @@
<% if self.title == "Events" then %>
<%+footer%>
-<% end %>
\ No newline at end of file
+<% end %>
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/newcontainer_resolve.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/newcontainer_resolve.htm
index 52a25d1981..e26bacf33f 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/newcontainer_resolve.htm
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/dockerman/newcontainer_resolve.htm
@@ -73,7 +73,7 @@
let reg_rem =/`#.+`/g// the command has `# `
cmd_line = cmd_line.replace(/^docker\s+(run|create)/,"DOCKERCLI").replace(reg_rem, " ").replace(reg_muti_line, " ").replace(reg_space, " ")
console.log(cmd_line)
- window.location.href = "/cgi-bin/luci/admin/docker/newcontainer/" + encodeURI(cmd_line)
+ window.location.href = "/cgi-bin/luci/admin/services/docker/newcontainer/" + encodeURI(cmd_line)
}
function clear_text(){
@@ -92,4 +92,4 @@
<%+cbi/valueheader%>
<%:Setting%>
+
+
diff --git a/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po b/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po
index 73e8c11b67..40f377f435 100644
--- a/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po
+++ b/package/ctcgfw/luci-app-dockerman/po/zh-cn/dockerman.po
@@ -411,33 +411,3 @@ msgstr "错误"
msgid "Console"
msgstr "控制台"
-
-msgid "DockerMan is a Simple Docker manager client for LuCI, If you have any issue please visit:"
-msgstr "DockerMan 是一个简单的 Docker 管理客户端，如果您在使用过程中有问题，请访问："
-
-msgid "Access Control for the bridge network"
-msgstr "birdge 网络访问控制"
-
-msgid "Allowed access interfaces"
-msgstr "允许访问的接口"
-
-msgid "Containers allowed to be accessed"
-msgstr "允许被访问的容器"
-
-msgid "Which container(s) can be accessed, even from interfaces that are not allowed, fill-in Container Id or Name"
-msgstr "哪些容器可以被访问，即使访问来自不被允许的接口，填入容器ID或容器名"
-
-msgid "Which interface(s) can access containers under the bridge network, fill-in Interface Name"
-msgstr "哪些接口可以访问 bridge 网络下的容器, 填入接口名"
-
-msgid "Dockerman connect to remote endpoint"
-msgstr "Dockerman 将连接到远程节点"
-
-msgid "Access Control"
-msgstr "访问控制"
-
-msgid "Create macvlan interface"
-msgstr "创建 macvlan 接口"
-
-msgid "Auto create macvlan interface in Openwrt"
-msgstr "在 Openwrt 中自动创建 macvlan 接口"
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/root/etc/config/dockerd b/package/ctcgfw/luci-app-dockerman/root/etc/config/dockerd
new file mode 100644
index 0000000000..d0ae9596d8
--- /dev/null
+++ b/package/ctcgfw/luci-app-dockerman/root/etc/config/dockerd
@@ -0,0 +1,5 @@
+config section 'local'
+ option ea 'true'
+ option en_wan 'false'
+ option data_root '/opt/docker'
+ option log_level 'warn'
diff --git a/package/ctcgfw/luci-app-dockerman/root/etc/config/dockerman b/package/ctcgfw/luci-app-dockerman/root/etc/config/dockerman
index 63e30bf24c..f13c5c205e 100644
--- a/package/ctcgfw/luci-app-dockerman/root/etc/config/dockerman
+++ b/package/ctcgfw/luci-app-dockerman/root/etc/config/dockerman
@@ -1,10 +1,5 @@
config section 'local'
option socket_path '/var/run/docker.sock'
option status_path '/tmp/.docker_action_status'
- option debug 'false'
option debug_path '/tmp/.docker_debug'
- option remote_endpoint 'false'
- option daemon_ea 'true'
- option daemon_data_root '/opt/docker'
- option daemon_log_level 'warn'
- list ac_allowed_interface 'br-lan'
+ option debug 'false'
diff --git a/package/ctcgfw/luci-app-dockerman/root/etc/docker-init b/package/ctcgfw/luci-app-dockerman/root/etc/docker-init
new file mode 100755
index 0000000000..45b9769a51
--- /dev/null
+++ b/package/ctcgfw/luci-app-dockerman/root/etc/docker-init
@@ -0,0 +1,25 @@
+#!/bin/sh
+dtype=`fdisk -l /dev/sda | grep 'Disklabel type' | awk '{print $3}'`
+partid="0"
+
+if [ "$dtype" = "gpt" ]
+then
+ partid=`echo "n
+
+
+
+w
+" | fdisk /dev/sda | grep 'Created a new partition' | awk '{print $5}'`
+
+elif [ "$dtype" = "dos" ]
+then
+ partid=`echo "n
+p
+
+
+
+w
+" | fdisk /dev/sda | grep 'Created a new partition' | awk '{print $5}'`
+fi
+
+echo "y" | mkfs.ext4 /dev/sda$partid
diff --git a/package/ctcgfw/luci-app-dockerman/root/etc/hotplug.d/iface/01-docker-macvlan b/package/ctcgfw/luci-app-dockerman/root/etc/hotplug.d/iface/01-docker-macvlan
deleted file mode 100644
index d2143d3b07..0000000000
--- a/package/ctcgfw/luci-app-dockerman/root/etc/hotplug.d/iface/01-docker-macvlan
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-
-[ "$ACTION" = "ifup" ] && {
- DK_MACVLANS=$(docker network ls -qf driver=macvlan)
- for DK_NETWORK_ID in ${DK_MACVLANS}
- do
- INTERFACE=$(docker network inspect "$DK_NETWORK_ID" --format '{{json .Options.parent}}' | sed -e 's/^"//' -e 's/"$//')
- [ "$INTERFACE" = "$DEVICE" ] && {
- echo "$DK_NETWORK_ID" >/tmp/dockerman
- echo "$INTERFACE" >>/tmp/dockerman
- DK_NETWORK_NAME=$(docker network inspect "$DK_NETWORK_ID" --format '{{json .Name}}' | sed -e 's/^"//' -e 's/"$//')
- ip link add link "$INTERFACE" "docker_$DK_NETWORK_NAME" type macvlan mode bridge >/dev/null 2>&1
- ip link set "docker_$DK_NETWORK_NAME" up >/dev/null 2>&1
- }
- done
-}
diff --git a/package/ctcgfw/luci-app-dockerman/root/etc/init.d/dockerd b/package/ctcgfw/luci-app-dockerman/root/etc/init.d/dockerd
new file mode 100755
index 0000000000..777f246ec9
--- /dev/null
+++ b/package/ctcgfw/luci-app-dockerman/root/etc/init.d/dockerd
@@ -0,0 +1,66 @@
+#!/bin/sh /etc/rc.common
+
+USE_PROCD=1
+START=99
+NAME=dockerd_local
+DOCKERD_CONF="/etc/docker/daemon.json"
+
+append_list_item() {
+ append "$2" "$1" "\",\""
+}
+
+get_config() {
+ config_load $1
+ config_get ea "local" ea
+ config_get en_wan "local" en_wan
+ config_get data_root "local" data_root '/opt/docker'
+ config_get log_level "local" log_level 'warn'
+ config_list_foreach "local" registry_mirrors append_list_item registry_mirrors
+ config_list_foreach "local" hosts append_list_item hosts
+}
+
+gen_config(){
+ cat <<-EOF >$DOCKERD_CONF
+{
+ "data-root": "$data_root",
+ "log-level": "$log_level",
+ "registry-mirrors": ["$registry_mirrors"],
+ "hosts": ["$hosts"]
+}
+EOF
+sed -i 's/\[\"\"\]/\[\]/g' $DOCKERD_CONF
+}
+
+_start() {
+ local nofile=$(cat /proc/sys/fs/nr_open)
+ get_config dockerd
+ gen_config
+ if [ -n "$en_wan" ]; then
+ iptables -D DOCKER-USER ! -i br-lan -m conntrack --ctstate NEW,INVALID -o docker0 -j DROP >/dev/null 2>&1
+ iptables -D DOCKER-USER ! -i br-lan -m conntrack --ctstate ESTABLISHED,RELATED -o docker0 -j RETURN >/dev/null 2>&1
+ else
+ iptables -D DOCKER-USER ! -i br-lan -m conntrack --ctstate NEW,INVALID -o docker0 -j DROP >/dev/null 2>&1
+ iptables -D DOCKER-USER ! -i br-lan -m conntrack --ctstate ESTABLISHED,RELATED -o docker0 -j RETURN >/dev/null 2>&1
+ iptables -I DOCKER-USER ! -i br-lan -m conntrack --ctstate ESTABLISHED,RELATED -o docker0 -j RETURN >/dev/null 2>&1
+ iptables -I DOCKER-USER ! -i br-lan -m conntrack --ctstate NEW,INVALID -o docker0 -j DROP >/dev/null 2>&1
+ fi
+ if [ -n "$ea" ]; then
+ procd_open_instance $NAME
+ procd_set_param stderr 1
+ procd_set_param command /usr/bin/dockerd
+ procd_set_param limits nofile="${nofile} ${nofile}"
+ procd_close_instance
+ fi
+}
+
+start_service() {
+ _start
+}
+
+service_triggers() {
+ procd_add_reload_trigger dockerd
+}
+
+reload_service() {
+ restart
+}
diff --git a/package/ctcgfw/luci-app-dockerman/root/etc/init.d/dockerman b/package/ctcgfw/luci-app-dockerman/root/etc/init.d/dockerman
deleted file mode 100644
index 285486d550..0000000000
--- a/package/ctcgfw/luci-app-dockerman/root/etc/init.d/dockerman
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh /etc/rc.common
-
-START=99
-DOCKERD_CONF="/etc/docker/daemon.json"
-
-config_load dockerman
-config_get daemon_ea "local" daemon_ea
-
-init_dockerman_chain(){
- iptables -N DOCKER-MAN >/dev/null 2>&1
- iptables -F DOCKER-MAN >/dev/null 2>&1
- iptables -D DOCKER-USER -j DOCKER-MAN >/dev/null 2>&1
- iptables -I DOCKER-USER -j DOCKER-MAN >/dev/null 2>&1
-}
-
-add_allowed_interface(){
- iptables -A DOCKER-MAN -i $1 -o docker0 -j RETURN
-}
-
-add_allowed_ip(){
- iptables -A DOCKER-MAN -d $1 -o docker0 -j RETURN
-}
-
-handle_allowed_interface(){
- #config_list_foreach "local" allowed_ip add_allowed_ip
- config_list_foreach "local" ac_allowed_interface add_allowed_interface
- iptables -A DOCKER-MAN -m conntrack --ctstate ESTABLISHED,RELATED -o docker0 -j RETURN >/dev/null 2>&1
- iptables -A DOCKER-MAN -m conntrack --ctstate NEW,INVALID -o docker0 -j DROP >/dev/null 2>&1
- iptables -A DOCKER-MAN -j RETURN >/dev/null 2>&1
-}
-
-start(){
- init_dockerman_chain
- if [ -n "$daemon_ea" ]; then
- handle_allowed_interface
- lua /usr/share/dockerman/dockerd-config.lua "$DOCKERD_CONF" && /etc/init.d/dockerd restart && sleep 5 || {
- # 1 running, 0 stopped
- STATE=$([ -n "$(ps |grep /usr/bin/dockerd | grep -v grep)" ] && echo 1 || echo 0)
- [ "$STATE" == "0" ] && /etc/init.d/dockerd start && sleep 5
- }
- lua /usr/share/dockerman/dockerd-ac.lua
- else
- /etc/init.d/dockerd stop
- fi
-}
diff --git a/package/ctcgfw/luci-app-dockerman/root/etc/uci-defaults/luci-app-dockerman b/package/ctcgfw/luci-app-dockerman/root/etc/uci-defaults/luci-app-dockerman
old mode 100644
new mode 100755
index 1c67049cef..9ad21a711f
--- a/package/ctcgfw/luci-app-dockerman/root/etc/uci-defaults/luci-app-dockerman
+++ b/package/ctcgfw/luci-app-dockerman/root/etc/uci-defaults/luci-app-dockerman
@@ -1,14 +1,14 @@
#!/bin/sh
uci -q batch <<-EOF >/dev/null
- set uhttpd.main.script_timeout="360"
+ set uhttpd.main.script_timeout="600"
commit uhttpd
- delete ucitrack.@dockerman[-1]
- add ucitrack dockerman
- set ucitrack.@dockerman[-1].exec='/etc/init.d/dockerman start'
+ delete ucitrack.@dockerd[-1]
+ add ucitrack dockerd
+ set ucitrack.@dockerd[-1].init=dockerd
commit ucitrack
EOF
-[ -x "$(which dockerd)" ] && chmod +x /etc/init.d/dockerman && /etc/init.d/dockerd disable && /etc/init.d/dockerman enable >/dev/null 2>&1
+/etc/init.d/dockerd enable >/dev/null 2>&1
/etc/init.d/uhttpd restart >/dev/null 2>&1
rm -fr /tmp/luci-indexcache /tmp/luci-modulecache >/dev/null 2>&1
-exit 0
\ No newline at end of file
+exit 0
diff --git a/package/ctcgfw/luci-app-dockerman/root/usr/share/dockerman/dockerd-ac.lua b/package/ctcgfw/luci-app-dockerman/root/usr/share/dockerman/dockerd-ac.lua
deleted file mode 100644
index e8a2c0b7eb..0000000000
--- a/package/ctcgfw/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/package/ctcgfw/luci-app-dockerman/root/usr/share/dockerman/dockerd-config.lua b/package/ctcgfw/luci-app-dockerman/root/usr/share/dockerman/dockerd-config.lua
deleted file mode 100644
index 16dcb00b43..0000000000
--- a/package/ctcgfw/luci-app-dockerman/root/usr/share/dockerman/dockerd-config.lua
+++ /dev/null
@@ -1,50 +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)
-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")
-new_json["registry-mirrors"] = uci:get("dockerman", "local", "daemon_registry_mirrors")
-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
- fs.writefile(raw_file_dir, luci.jsonc.stringify(raw_json, true):gsub("\\", ""))
- os.exit(0)
-else
- os.exit(1)
-end