From a9bcc030f9f50db464b6dde1b08775954a53c9fd Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Wed, 12 Feb 2020 20:38:44 +0800 Subject: [PATCH] Merge Lean's source --- package/ctcgfw/luci-app-dockerman/Makefile | 6 +-- .../luasrc/controller/dockerman.lua | 24 +++++----- .../luasrc/model/cbi/docker/container.lua | 16 +++---- .../luasrc/model/cbi/docker/containers.lua | 10 ++--- .../luasrc/model/cbi/docker/images.lua | 10 ++--- .../luasrc/model/cbi/docker/networks.lua | 6 +-- .../luasrc/model/cbi/docker/newcontainer.lua | 10 ++--- .../luasrc/model/cbi/docker/newnetwork.lua | 8 ++-- .../luasrc/model/cbi/docker/volumes.lua | 6 +-- .../luasrc/model/docker.lua | 2 +- .../luasrc/view/docker/apply_widget.htm | 4 +- .../luasrc/view/docker/cbi/dummyvalue.htm | 2 +- .../luasrc/view/docker/container.htm | 6 +-- .../luasrc/view/docker/logs.htm | 2 +- .../luasrc/view/docker/overview.htm | 10 ++--- .../luasrc/view/docker/resolv_container.htm | 4 +- .../luasrc/view/docker/stats.htm | 4 +- .../luci-app-dockerman/root/etc/config/docker | 2 +- .../luci-app-dockerman/root/etc/docker-init | 25 +++++++++++ package/ctcgfw/openwrt-v2ray-plugin/Makefile | 3 +- package/kernel/antfs/Makefile | 44 +++++++++++++++++++ 21 files changed, 136 insertions(+), 68 deletions(-) create mode 100755 package/ctcgfw/luci-app-dockerman/root/etc/docker-init create mode 100644 package/kernel/antfs/Makefile diff --git a/package/ctcgfw/luci-app-dockerman/Makefile b/package/ctcgfw/luci-app-dockerman/Makefile index db8bf0c598..75f17a5471 100644 --- a/package/ctcgfw/luci-app-dockerman/Makefile +++ b/package/ctcgfw/luci-app-dockerman/Makefile @@ -15,7 +15,7 @@ define Package/$(PKG_NAME) SUBMENU:=3. Applications TITLE:=Docker Manager interface for LuCI PKGARCH:=all - DEPENDS:=+luci-lib-docker +luci-app-docker + DEPENDS:=+luci-lib-docker +docker-ce +e2fsprogs +fdisk endef define Package/$(PKG_NAME)/description @@ -39,7 +39,7 @@ define Package/$(PKG_NAME)/install $(INSTALL_DIR) $(1)/ cp -pR ./root/* $(1)/ $(INSTALL_DIR) $(1)/usr/lib/lua/luci/i18n - po2lmo ./po/zh_Hans/dockerman.po $(1)/usr/lib/lua/luci/i18n/dockerman.zh-cn.lmo + po2lmo ./po/zh-cn/dockerman.po $(1)/usr/lib/lua/luci/i18n/dockerman.zh-cn.lmo endef -$(eval $(call BuildPackage,$(PKG_NAME))) \ No newline at end of file +$(eval $(call BuildPackage,$(PKG_NAME))) diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/controller/dockerman.lua b/package/ctcgfw/luci-app-dockerman/luasrc/controller/dockerman.lua index 01e06a18ac..794224f0a8 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", "docker"}, firstchild(), "Docker", 40).dependent = false - entry({"admin","docker","overview"},cbi("docker/overview"),_("Overview"),0).leaf=true + entry({"admin", "services","docker"}, firstchild(), "Docker", 40).dependent = false + entry({"admin","services","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","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 + 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 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 7a0d483724..d27c52f954 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/docker/container/"..container_id)) + luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/container/"..container_id)) else docker:clear_status() if cmd ~= "remove" and cmd ~= "upgrade" then - luci.http.redirect(luci.dispatcher.build_url("admin/docker/container/"..container_id)) + luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/container/"..container_id)) else - luci.http.redirect(luci.dispatcher.build_url("admin/docker/containers")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/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/docker/containers") +m.redirect = luci.dispatcher.build_url("admin/services/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/docker/newcontainer/duplicate/"..container_id)) + luci.http.redirect(luci.dispatcher.build_url("admin/services/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/docker/container/"..container_id.."/info")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/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/docker/container/"..container_id.."/edit")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/container/"..container_id.."/edit")) end end elseif action == "logs" then @@ -479,4 +479,4 @@ m.reset = false end -return m \ No newline at end of file +return m 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 01d1e0e22c..dc47422979 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/docker/container/" .. urlencode(container_id:cfgvalue(section))) + return luci.dispatcher.build_url("admin/services/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/docker/image/" .. urlencode(c_lists[section]._image_id)) +-- return luci.dispatcher.build_url("admin/services/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/docker/containers")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/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/docker/newcontainer")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/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 \ No newline at end of file +return m 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 5400fd6485..9935f3fa8f 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="lisaac/luci:latest" +tag_name.placeholder="hello-world: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/docker/images")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/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/docker/images")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/images")) end end @@ -170,4 +170,4 @@ btnforceremove.forcewrite = true btnforceremove.write = function(self, section) remove_action(true) end -return m \ No newline at end of file +return m 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 2bad757b80..9337e96b3f 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/docker/newnetwork")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/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/docker/networks")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/networks")) end end -return m \ No newline at end of file +return m 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 116cad24e8..6e2cc689dd 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", "docker", "containers") +m.redirect = luci.dispatcher.build_url("admin", "services","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/docker/newcontainer")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/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/docker/containers")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/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/docker/newcontainer")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/newcontainer")) end end -return m \ No newline at end of file +return m 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 08b0c01fb3..c599f0a666 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", "docker", "networks") +m.redirect = luci.dispatcher.build_url("admin", "services","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/docker/networks")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/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/docker/newnetwork")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/newnetwork")) end end end -return m \ No newline at end of file +return m 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 b2d5e52182..06ac409a76 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/docker/volumes")) + luci.http.redirect(luci.dispatcher.build_url("admin/services/docker/volumes")) end end -return m \ No newline at end of file +return m diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/docker.lua index 925cd82cba..e61d8f95a2 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 \ No newline at end of file +return _docker 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 5c7ff1ac36..b9de0408fd 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/docker/confirm")%>', null, call, uci_apply_timeout * 1000); + xhr.get('<%=url("admin/services/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 b82589e07d..ac8a48aba4 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%> \ No newline at end of file +<%+cbi/valuefooter%> 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 51c7f0acf4..da53b75e53 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 aba03bab55..6e189c66af 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 %> \ No newline at end of file +<% end %> 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 da338280e5..f8b67eee31 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

<%:Containers%>

- <%- if self.containers_total ~= "-" then -%><%- end -%> + <%- if self.containers_total ~= "-" then -%><%- end -%> <%=self.containers_running%> /<%=self.containers_total%> <%- if self.containers_total ~= "-" then -%><%- end -%> @@ -161,7 +161,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md

<%:Images%>

- <%- if self.images_total ~= "-" then -%><%- end -%> + <%- if self.images_total ~= "-" then -%><%- end -%> <%=self.images_total%> <%- if self.images_total ~= "-" then -%><%- end -%> @@ -193,7 +193,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md

<%:Networks%>

- <%- if self.networks_total ~= "-" then -%><%- end -%> + <%- if self.networks_total ~= "-" then -%><%- end -%> <%=self.networks_total%> <%- if self.networks_total ~= "-" then -%><%- end -%> @@ -270,7 +270,7 @@ https://github.com/pure-css/pure/blob/master/LICENSE.md

<%:Volumes%>

- <%- if self.volumes_total ~= "-" then -%><%- end -%> + <%- if self.volumes_total ~= "-" then -%><%- end -%> <%=self.volumes_total%> <%- if self.volumes_total ~= "-" then -%><%- end -%> @@ -278,4 +278,4 @@ 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 5e42ad1a82..38abc914c3 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/docker/newcontainer/" + encodeURI(cmd_line) + window.location.href = "/cgi-bin/luci/admin/services/docker/newcontainer/" + encodeURI(cmd_line) } function clear_text(){ @@ -91,4 +91,4 @@ <%+cbi/valueheader%> -<%+cbi/valuefooter%> \ No newline at end of file +<%+cbi/valuefooter%> 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 5320db9dbf..2016181c58 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/docker/container_stats/<%=self.container_id%>', { status: 1 }, + XHR.poll(5, '/cgi-bin/luci/admin/services/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 fe78698788..f13c5c205e 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' \ No newline at end of file + 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/openwrt-v2ray-plugin/Makefile b/package/ctcgfw/openwrt-v2ray-plugin/Makefile index bda22d9c58..518d4b1218 100644 --- a/package/ctcgfw/openwrt-v2ray-plugin/Makefile +++ b/package/ctcgfw/openwrt-v2ray-plugin/Makefile @@ -10,7 +10,6 @@ include $(TOPDIR)/rules.mk PKG_NAME:=v2ray-plugin PKG_VERSION:=1.3.0 PKG_RELEASE:=1 -PKG_MAINTAINER:=ShareMax PKG_BUILD_DIR:=$(BUILD_DIR)/v2ray-plugin-$(PKG_VERSION) PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -22,7 +21,7 @@ PKG_LICENSE_FILES:=LICENSE PKG_MAINTAINER:=madeye GO_PKG:=github.com/shadowsocks/v2ray-plugin - +GO_PKG_LDFLAGS:=-s -w include $(INCLUDE_DIR)/package.mk include $(TOPDIR)/feeds/packages/lang/golang/golang-package.mk diff --git a/package/kernel/antfs/Makefile b/package/kernel/antfs/Makefile new file mode 100644 index 0000000000..30143a395d --- /dev/null +++ b/package/kernel/antfs/Makefile @@ -0,0 +1,44 @@ +include $(TOPDIR)/rules.mk +include $(INCLUDE_DIR)/kernel.mk + +PKG_NAME:=antfs +PKG_RELEASE:=1 + +PKG_SOURCE_URL:=https://github.com/klukonin/antfs.git +PKG_SOURCE_PROTO:=git +PKG_SOURCE_DATE:=2020-02-10 +PKG_SOURCE_VERSION:=b41ba529f6b64b429527e09a06ce0326d5456c05 +PKG_MIRROR_HASH:=dae039c0fe5bf1a2c8c1cca4211d607a4d6f56fc41b38444e2234b40d710d9db + +PKG_LICENSE:=GPL-2.0-only +PKG_LICENSE_FILES:=LICENSE + +include $(INCLUDE_DIR)/package.mk + +define KernelPackage/fs-antfs + SUBMENU:=Filesystems + TITLE:=AVM NTFS Read/Write Driver + FILES:=$(PKG_BUILD_DIR)/antfs.ko + AUTOLOAD:=$(call AutoLoad,30,antfs,1) + DEPENDS:=+kmod-nls-base +endef + +define KernelPackage/fs-antfs/description + Kernel module for NTFS Filesytem +endef + +MAKE_OPTS:= \ + ARCH="$(LINUX_KARCH)" \ + CROSS_COMPILE="$(TARGET_CROSS)" \ + M="$(PKG_BUILD_DIR)" + +define Build/Compile + $(MAKE) -C "$(LINUX_DIR)" \ + $(MAKE_OPTS) \ + CONFIG_ANTFS_FS=m \ + CONFIG_ANTFS_SYMLINKS=y \ + ANTFS_VERSION=07.19-$(call version_abbrev,$(PKG_SOURCE_VERSION)) \ + modules +endef + +$(eval $(call KernelPackage,fs-antfs))