diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/controller/dockerman.lua b/package/ctcgfw/luci-app-dockerman/luasrc/controller/dockerman.lua
index 794224f0a8..01e06a18ac 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/controller/dockerman.lua
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/controller/dockerman.lua
@@ -10,22 +10,22 @@ module("luci.controller.dockerman",package.seeall)
function index()
- entry({"admin", "services","docker"}, firstchild(), "Docker", 40).dependent = false
- entry({"admin","services","docker","overview"},cbi("docker/overview"),_("Overview"),0).leaf=true
+ entry({"admin", "docker"}, firstchild(), "Docker", 40).dependent = false
+ entry({"admin","docker","overview"},cbi("docker/overview"),_("Overview"),0).leaf=true
local socket = luci.model.uci.cursor():get("docker", "local", "socket_path")
if not nixio.fs.access(socket) then return end
if (require "luci.model.docker").new():_ping().code ~= 200 then return end
- entry({"admin","services","docker","containers"},form("docker/containers"),_("Containers"),1).leaf=true
- entry({"admin","services","docker","images"},form("docker/images"),_("Images"),2).leaf=true
- entry({"admin","services","docker","networks"},form("docker/networks"),_("Networks"),3).leaf=true
- entry({"admin","services","docker","volumes"},form("docker/volumes"),_("Volumes"),4).leaf=true
- entry({"admin","services","docker","events"},call("action_events"),_("Events"),5)
- entry({"admin","services","docker","newcontainer"},form("docker/newcontainer")).leaf=true
- entry({"admin","services","docker","newnetwork"},form("docker/newnetwork")).leaf=true
- entry({"admin","services","docker","container"},form("docker/container")).leaf=true
- entry({"admin","services","docker","container_stats"},call("action_get_container_stats")).leaf=true
- entry({"admin","services","docker","confirm"},call("action_confirm")).leaf=true
+ entry({"admin","docker","containers"},form("docker/containers"),_("Containers"),1).leaf=true
+ entry({"admin","docker","images"},form("docker/images"),_("Images"),2).leaf=true
+ entry({"admin","docker","networks"},form("docker/networks"),_("Networks"),3).leaf=true
+ entry({"admin","docker","volumes"},form("docker/volumes"),_("Volumes"),4).leaf=true
+ entry({"admin","docker","events"},call("action_events"),_("Events"),5)
+ entry({"admin","docker","newcontainer"},form("docker/newcontainer")).leaf=true
+ entry({"admin","docker","newnetwork"},form("docker/newnetwork")).leaf=true
+ entry({"admin","docker","container"},form("docker/container")).leaf=true
+ entry({"admin","docker","container_stats"},call("action_get_container_stats")).leaf=true
+ entry({"admin","docker","confirm"},call("action_confirm")).leaf=true
end
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua
index d27c52f954..7a0d483724 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/container.lua
@@ -116,20 +116,20 @@ local start_stop_remove = function(m, cmd)
end
if res and res.code >= 300 then
docker:append_status("fail code:" .. res.code.." ".. (res.body.message and res.body.message or res.message))
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/container/"..container_id))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/container/"..container_id))
else
docker:clear_status()
if cmd ~= "remove" and cmd ~= "upgrade" then
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/container/"..container_id))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/container/"..container_id))
else
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/containers"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/containers"))
end
end
end
m=SimpleForm("docker", container_info.Name:sub(2), translate("Docker Container") )
m.template = "docker/cbi/xsimpleform"
-m.redirect = luci.dispatcher.build_url("admin/services/docker/containers")
+m.redirect = luci.dispatcher.build_url("admin/docker/containers")
-- m:append(Template("docker/container"))
docker_status = m:section(SimpleSection)
docker_status.template="docker/apply_widget"
@@ -190,7 +190,7 @@ btnstop.write = function(self, section)
start_stop_remove(m,"stop")
end
btnduplicate.write = function(self, section)
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/newcontainer/duplicate/"..container_id))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/newcontainer/duplicate/"..container_id))
end
tab_section = m:section(SimpleSection)
@@ -365,7 +365,7 @@ if action == "info" then
else
docker:clear_status()
end
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/container/"..container_id.."/info"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/container/"..container_id.."/info"))
end
-- info end
@@ -426,7 +426,7 @@ elseif action == "edit" then
else
docker:clear_status()
end
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/container/"..container_id.."/edit"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/container/"..container_id.."/edit"))
end
end
elseif action == "logs" then
@@ -479,4 +479,4 @@ m.reset = false
end
-return m
+return m
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/containers.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/containers.lua
index dc47422979..01d1e0e22c 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/containers.lua
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/containers.lua
@@ -93,7 +93,7 @@ container_name = c_table:option(DummyValue, "_name", translate("Container Name")
container_name.width="20%"
container_name.template="docker/cbi/dummyvalue"
container_name.href = function (self, section)
- return luci.dispatcher.build_url("admin/services/docker/container/" .. urlencode(container_id:cfgvalue(section)))
+ return luci.dispatcher.build_url("admin/docker/container/" .. urlencode(container_id:cfgvalue(section)))
end
container_status = c_table:option(DummyValue, "_status", translate("Status"))
container_status.width="15%"
@@ -106,7 +106,7 @@ container_image = c_table:option(DummyValue, "_image", translate("Image"))
container_image.template="docker/cbi/dummyvalue"
container_image.width="10%"
-- container_image.href = function (self, section)
--- return luci.dispatcher.build_url("admin/services/docker/image/" .. urlencode(c_lists[section]._image_id))
+-- return luci.dispatcher.build_url("admin/docker/image/" .. urlencode(c_lists[section]._image_id))
-- end
container_command = c_table:option(DummyValue, "_command", translate("Command"))
container_command.width="20%"
@@ -145,7 +145,7 @@ local start_stop_remove = function(m,cmd)
end
end
if success then docker:clear_status() end
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/containers"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/containers"))
end
end
@@ -180,7 +180,7 @@ btnremove.inputtitle=translate("Remove")
btnremove.inputstyle = "remove"
btnremove.forcewrite = true
btnnew.write = function(self, section)
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/newcontainer"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/newcontainer"))
end
btnstart.write = function(self, section)
start_stop_remove(m,"start")
@@ -195,4 +195,4 @@ btnstop.write = function(self, section)
start_stop_remove(m,"stop")
end
-return m
+return m
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/images.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/images.lua
index 9935f3fa8f..5400fd6485 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/images.lua
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/images.lua
@@ -32,7 +32,7 @@ function get_images()
for ci,cv in ipairs(containers) do
if v.Id == cv.ImageID then
data[index]["_containers"] = (data[index]["_containers"] and (data[index]["_containers"] .. " | ") or "")..
- "".. cv.Names[1]:sub(2)..""
+ "".. cv.Names[1]:sub(2)..""
end
end
data[index]["_size"] = string.format("%.2f", tostring(v.Size/1024/1024)).."MB"
@@ -54,7 +54,7 @@ local pull_section = m:section(Table,pull_value, translate("Pull Image"))
pull_section.template="cbi/nullsection"
local tag_name = pull_section:option(Value, "_image_tag_name")
tag_name.template="docker/cbi/inlinevalue"
-tag_name.placeholder="hello-world:latest"
+tag_name.placeholder="lisaac/luci:latest"
local registry = pull_section:option(Value, "_registry")
registry.template="docker/cbi/inlinevalue"
registry:value("index.docker.io", "DockerHub")
@@ -91,7 +91,7 @@ action_pull.write = function(self, section)
else
docker:append_status("done
")
end
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/images"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/images"))
end
end
@@ -139,7 +139,7 @@ local remove_action = function(force)
end
end
if success then docker:clear_status() end
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/images"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/images"))
end
end
@@ -170,4 +170,4 @@ btnforceremove.forcewrite = true
btnforceremove.write = function(self, section)
remove_action(true)
end
-return m
+return m
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/networks.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/networks.lua
index 9337e96b3f..2bad757b80 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/networks.lua
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/networks.lua
@@ -83,7 +83,7 @@ btnnew.notitle=true
btnnew.inputstyle = "add"
btnnew.forcewrite = true
btnnew.write = function(self, section)
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/newnetwork"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/newnetwork"))
end
btnremove = action:option(Button, "_remove")
btnremove.inputtitle= translate("Remove")
@@ -116,8 +116,8 @@ btnremove.write = function(self, section)
if success then
docker:clear_status()
end
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/networks"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/networks"))
end
end
-return m
+return m
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua
index 6e2cc689dd..116cad24e8 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua
@@ -205,7 +205,7 @@ end
local m = SimpleForm("docker", translate("Docker"))
m.template = "docker/cbi/xsimpleform"
-m.redirect = luci.dispatcher.build_url("admin", "services","docker", "containers")
+m.redirect = luci.dispatcher.build_url("admin", "docker", "containers")
-- m.reset = false
-- m.submit = false
-- new Container
@@ -546,7 +546,7 @@ m.handle = function(self, state, data)
docker:append_status("done
")
else
docker:append_status("fail code:" .. res.code.." ".. (res.body.message and res.body.message or res.message).. "
")
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/newcontainer"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/newcontainer"))
end
end
docker:clear_status()
@@ -569,11 +569,11 @@ m.handle = function(self, state, data)
local res = dk.containers:create(name, nil, create_body)
if res and res.code == 201 then
docker:clear_status()
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/containers"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/containers"))
else
docker:append_status("fail code:" .. res.code.." ".. (res.body.message and res.body.message or res.message))
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/newcontainer"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/newcontainer"))
end
end
-return m
+return m
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua
index c599f0a666..08b0c01fb3 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newnetwork.lua
@@ -10,7 +10,7 @@ local dk = docker.new()
m = SimpleForm("docker", translate("Docker"))
m.template = "docker/cbi/xsimpleform"
-m.redirect = luci.dispatcher.build_url("admin", "services","docker", "networks")
+m.redirect = luci.dispatcher.build_url("admin", "docker", "networks")
docker_status = m:section(SimpleSection)
docker_status.template="docker/apply_widget"
@@ -194,12 +194,12 @@ m.handle = function(self, state, data)
local res = dk.networks:create(nil, nil, create_body)
if res and res.code == 201 then
docker:clear_status()
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/networks"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/networks"))
else
docker:append_status("fail code:" .. res.code.." ".. (res.body.message and res.body.message or res.message).. "
")
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/newnetwork"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/newnetwork"))
end
end
end
-return m
+return m
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua
index 06ac409a76..b2d5e52182 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/volumes.lua
@@ -28,7 +28,7 @@ function get_volumes()
for vi, vv in ipairs(cv.Mounts) do
if v.Name == vv.Name then
data[index]["_containers"] = (data[index]["_containers"] and (data[index]["_containers"] .. " | ") or "")..
- "".. cv.Names[1]:sub(2)..""
+ "".. cv.Names[1]:sub(2)..""
end
end
end
@@ -110,7 +110,7 @@ btnremove.write = function(self, section)
end
end
if success then docker:clear_status() end
- luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/volumes"))
+ luci.http.redirect(luci.dispatcher.build_url("admin/docker/volumes"))
end
end
-return m
+return m
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua
index e61d8f95a2..925cd82cba 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua
@@ -226,4 +226,4 @@ _docker.clear_status=function(self)
nixio.fs.remove(self.options.status_path)
end
-return _docker
+return _docker
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/apply_widget.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/apply_widget.htm
index b9de0408fd..5c7ff1ac36 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/apply_widget.htm
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/apply_widget.htm
@@ -94,7 +94,7 @@ function uci_confirm_docker() {
// var delay = isNaN(duration) ? 0 : Math.max(1000 - duration, 0);
var delay =1000
window.setTimeout(function() {
- xhr.get('<%=url("admin/services/docker/confirm")%>', null, call, uci_apply_timeout * 1000);
+ xhr.get('<%=url("admin/docker/confirm")%>', null, call, uci_apply_timeout * 1000);
}, delay);
};
@@ -136,4 +136,4 @@ var buttons = document.querySelectorAll('input[type="submit"]');
});
}
-//]]>
+//]]>
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/cbi/dummyvalue.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/cbi/dummyvalue.htm
index ac8a48aba4..b82589e07d 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/cbi/dummyvalue.htm
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/cbi/dummyvalue.htm
@@ -10,4 +10,4 @@
%>
<%- if self.href then %><%end%>
" />
-<%+cbi/valuefooter%>
+<%+cbi/valuefooter%>
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/container.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/container.htm
index da53b75e53..51c7f0acf4 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/container.htm
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/container.htm
@@ -7,18 +7,18 @@
+
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/logs.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/logs.htm
index 6e189c66af..aba03bab55 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/logs.htm
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/logs.htm
@@ -7,4 +7,4 @@
<% if self.title == translate("Docker Events") then %>
<%+footer%>
-<% end %>
+<% end %>
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/overview.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/overview.htm
index f8b67eee31..da338280e5 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/overview.htm
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/overview.htm
@@ -137,7 +137,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md
+
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/resolv_container.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/resolv_container.htm
index 38abc914c3..5e42ad1a82 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/resolv_container.htm
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/resolv_container.htm
@@ -72,7 +72,7 @@
let reg_rem =/`#.+`/g// the command has `# `
cmd_line = cmd_line.replace(reg_rem, " ").replace(reg_muti_line, " ").replace(reg_space, " ")
console.log(cmd_line)
- window.location.href = "/cgi-bin/luci/admin/services/docker/newcontainer/" + encodeURI(cmd_line)
+ window.location.href = "/cgi-bin/luci/admin/docker/newcontainer/" + encodeURI(cmd_line)
}
function clear_text(){
@@ -91,4 +91,4 @@
<%+cbi/valueheader%>
-<%+cbi/valuefooter%>
+<%+cbi/valuefooter%>
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/stats.htm b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/stats.htm
index 2016181c58..5320db9dbf 100644
--- a/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/stats.htm
+++ b/package/ctcgfw/luci-app-dockerman/luasrc/view/docker/stats.htm
@@ -22,7 +22,7 @@
return parseFloat((bytes / Math.pow(k, i)).toFixed(dm)) + ' ' + sizes[i];
}
- XHR.poll(5, '/cgi-bin/luci/admin/services/docker/container_stats/<%=self.container_id%>', { status: 1 },
+ XHR.poll(5, '/cgi-bin/luci/admin/docker/container_stats/<%=self.container_id%>', { status: 1 },
function (x, info) {
var e;
@@ -57,4 +57,4 @@
}
});
-//]]>
+//]]>
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/root/etc/config/docker b/package/ctcgfw/luci-app-dockerman/root/etc/config/docker
index f13c5c205e..fe78698788 100644
--- a/package/ctcgfw/luci-app-dockerman/root/etc/config/docker
+++ b/package/ctcgfw/luci-app-dockerman/root/etc/config/docker
@@ -2,4 +2,4 @@ config section 'local'
option socket_path '/var/run/docker.sock'
option status_path '/tmp/.docker_action_status'
option debug_path '/tmp/.docker_debug'
- option debug 'false'
+ option debug 'false'
\ No newline at end of file
diff --git a/package/ctcgfw/luci-app-dockerman/root/etc/docker-init b/package/ctcgfw/luci-app-dockerman/root/etc/docker-init
deleted file mode 100755
index 45b9769a51..0000000000
--- a/package/ctcgfw/luci-app-dockerman/root/etc/docker-init
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/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