fish/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

luci-app-dockerman: bump to 0.2.1

Browse Source
This commit is contained in:
CN_SZTL 2020-02-10 14:02:42 +08:00
parent 02eb8aa7d7
commit 65e0a694a0
No known key found for this signature in database
GPG Key ID: 6850B6345C862176
3 changed files with 39 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
package/ctcgfw/luci-app-dockerman/Makefile
View File

@ -1,7 +1,7 @@
include $(TOPDIR)/rules.mk
PKG_NAME:=luci-app-dockerman
PKG_VERSION:=v0.2
PKG_VERSION:=v0.2.1
PKG_RELEASE:=beta
PKG_MAINTAINER:=lisaac <https://github.com/lisaac/luci-app-dockerman>
PKG_BUILD_DIR:=$(BUILD_DIR)/$(PKG_NAME)

9
package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/docker/newcontainer.lua
View File

@ -54,6 +54,7 @@ if cmd_line and cmd_line:match("^docker.+") then
else
default_config[_key] = default_config[_key] .. " ".. w
if is_quot_complete(default_config[_key]) then
-- clear quotation marks
default_config[_key] = default_config[_key]:gsub("[\"\']", "")
_key = nil
end
@ -101,8 +102,12 @@ if cmd_line and cmd_line:match("^docker.+") then
if key == "mount" or key == "link" or key == "env" or key == "dns" or key == "port" or key == "device" or key == "tmpfs" then
if not default_config[key] then default_config[key] = {} end
table.insert( default_config[key], val )
-- clear quotation marks
default_config[key][#default_config[key]] = default_config[key][#default_config[key]]:gsub("[\"\']", "")
else
default_config[key] = val
-- clear quotation marks
default_config[key] = default_config[key]:gsub("[\"\']", "")
end
-- if there are " or ' in val and separate by space, we need keep the _key to link with next w
if is_quot_complete(val) then
@ -119,8 +124,12 @@ if cmd_line and cmd_line:match("^docker.+") then
if key == "mount" or key == "link" or key == "env" or key == "dns" or key == "port" or key == "device" or key == "tmpfs" then
if not default_config[key] then default_config[key] = {} end
table.insert( default_config[key], w )
-- clear quotation marks
default_config[key][#default_config[key]] = default_config[key][#default_config[key]]:gsub("[\"\']", "")
else
default_config[key] = w
-- clear quotation marks
default_config[key] = default_config[key]:gsub("[\"\']", "")
end
if key == "cpus" or key == "cpushare" or key == "memory" or key == "blkioweight" or key == "device" or key == "tmpfs" then
default_config["advance"] = 1

55
package/ctcgfw/luci-app-dockerman/luasrc/view/docker/resolv_container.htm
View File

@ -1,4 +1,3 @@
<%+cbi/valueheader%>
<style type="text/css">
#dialog_reslov {
position: absolute;
@ -19,16 +18,15 @@
margin: auto;
display: flex;
flex-wrap: wrap;
min-height: 50%;
max-height: auto;
height:auto;
align-items: center;
}
#dialog_reslov .dialog_line {
margin-top: 10px;
margin-bottom: 10px;
margin-left: 20px;
margin-right: 20px;
margin-top: .5em;
margin-bottom: .5em;
margin-left: 2em;
margin-right: 2em;
}
#dialog_reslov .dialog_box>h4,
@ -53,39 +51,44 @@
</style>
<script type="text/javascript">
function close_reslov_dialog() {
document.body.classList.remove('dialog-reslov-active');
document.documentElement.style.overflowY = 'scroll';
document.body.classList.remove('dialog-reslov-active')
document.documentElement.style.overflowY = 'scroll'
}
function reslov_container(op) {
let s = document.getElementById(op + '-status');
if (!s) return;
function reslov_container() {
let s = document.getElementById('cmd-line-status')
if (!s) return
let cmd_line = document.getElementById("dialog_reslov_text").value;
if (cmd_line == null || cmd_line == "") {
s.innerHTML = "<font color='red'><%:Canceled%></font>";
close_reslov_dialog()
return;
return
}
if (!cmd_line.match(/^docker\s+(run|create)/)) {
s.innerHTML = "<font color='red'><%:Command line Error%></font>";
close_reslov_dialog()
return;
s.innerHTML = "<font color='red'><%:Command line Error%></font>"
return
}
let reg_space = /\s+/g
let reg_muti_line= /\\\s*\n/g
let reg_rem =/(?<!\\)`#.+(?<!\\)`/g // the command has `# `
// reg_rem =/(?<!\\)`#.+(?<!\\)`/g // the command has `# `
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)
}
function show_reslov_dialog(op) {
document.getElementById('dialog_reslov') || document.body.insertAdjacentHTML("beforeend", '<div id="dialog_reslov"><div class="dialog_box"><div class="dialog_line"></div><div class="dialog_line"><h5><%:Plese input <docker create/run> command line:%></h5></div><div class="dialog_line"><textarea class="cbi-input-textarea" id="dialog_reslov_text" style="width: 100%; height:100%;" rows="15"></textarea></div><div class="dialog_line"><input type="button" class="cbi-button cbi-button-apply" type="submit" value="<%:Submit%>" onclick="reslov_container(\'' + op + '\')" /> <input type="button" class="cbi-button cbi-button-reset" type="reset" value="<%:Cancel%>" onclick="close_reslov_dialog()" /></div></div></div>')
document.body.classList.add('dialog-reslov-active');
document.documentElement.style.overflowY = 'hidden';
function clear_text(){
let s = document.getElementById('cmd-line-status')
s.innerHTML = ""
}
function show_reslov_dialog() {
document.getElementById('dialog_reslov') || document.body.insertAdjacentHTML("beforeend", '<div id="dialog_reslov"><div class="dialog_box"><div class="dialog_line"></div><div class="dialog_line"><span><%:Plese input <docker create/run> command line:%></span><br><span id="cmd-line-status"></span></div><div class="dialog_line"><textarea class="cbi-input-textarea" id="dialog_reslov_text" style="width: 100%; height:100%;" rows="15" onkeyup="clear_text()"></textarea></div><div class="dialog_line" style="text-align: right;"><input type="button" class="cbi-button cbi-button-apply" type="submit" value="<%:Submit%>" onclick="reslov_container()" /> <input type="button" class="cbi-button cbi-button-reset" type="reset" value="<%:Cancel%>" onclick="close_reslov_dialog()" /></div><div class="dialog_line"></div></div></div>')
document.body.classList.add('dialog-reslov-active')
let s = document.getElementById('cmd-line-status')
s.innerHTML = ""
document.documentElement.style.overflowY = 'hidden'
}
</script>
<input type="button" class="cbi-button cbi-button-apply" value="<%:Command line%>"
onclick="show_reslov_dialog('<%=self.option%>')" />
<span id="<%=self.option%>-status"></span>
<%+cbi/valueheader%>
<input type="button" class="cbi-button cbi-button-apply" value="<%:Command line%>" onclick="show_reslov_dialog()" />
<%+cbi/valuefooter%>