mirror of
https://github.com/kiddin9/op-packages.git
synced 2026-07-27 10:31:38 +08:00
334 lines
7.3 KiB
Diff
334 lines
7.3 KiB
Diff
--- a/luci-app-dockerman/htdocs/luci-static/resources/dockerman/common.js
|
|
+++ b/luci-app-dockerman/htdocs/luci-static/resources/dockerman/common.js
|
|
@@ -437,7 +437,7 @@ const dv = view.extend({
|
|
outputText: '', // Initialize output text
|
|
|
|
get dockerman_url() {
|
|
- return L.url('admin/services/dockerman');
|
|
+ return L.url('admin/dockerman');
|
|
},
|
|
|
|
parseHeaders(headers, array) {
|
|
|
|
--- a/luci-app-dockerman/root/usr/share/luci/menu.d/luci-app-dockerman.json
|
|
+++ b/luci-app-dockerman/root/usr/share/luci/menu.d/luci-app-dockerman.json
|
|
@@ -1,7 +1,7 @@
|
|
{
|
|
- "admin/services/dockerman": {
|
|
- "title": "Dockerman JS",
|
|
- "order": "60",
|
|
+ "admin/dockerman": {
|
|
+ "title": "Docker",
|
|
+ "order": "40",
|
|
"action": {
|
|
"type": "firstchild"
|
|
},
|
|
@@ -15,7 +15,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/overview": {
|
|
+ "admin/dockerman/overview": {
|
|
"title": "Overview",
|
|
"order": 1,
|
|
"action": {
|
|
@@ -27,7 +27,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/configuration": {
|
|
+ "admin/dockerman/configuration": {
|
|
"title": "Configuration",
|
|
"order": 2,
|
|
"action": {
|
|
@@ -39,17 +39,17 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/container/archive/*": {
|
|
+ "admin/dockerman/container/archive/*": {
|
|
"action": {
|
|
"type": "alias",
|
|
- "path": "admin/services/dockerman/containers"
|
|
+ "path": "admin/dockerman/containers"
|
|
},
|
|
"depends": {
|
|
"acl": [ "luci-app-dockerman" ]
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/container/archive/put/*": {
|
|
+ "admin/dockerman/container/archive/put/*": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -64,7 +64,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/container/archive/get/*": {
|
|
+ "admin/dockerman/container/archive/get/*": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -79,7 +79,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/container/export/*": {
|
|
+ "admin/dockerman/container/export/*": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -94,7 +94,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/container/*": {
|
|
+ "admin/dockerman/container/*": {
|
|
"title_hide": "Container",
|
|
"action": {
|
|
"type": "view",
|
|
@@ -105,7 +105,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/containers": {
|
|
+ "admin/dockerman/containers": {
|
|
"title": "Containers",
|
|
"order": 3,
|
|
"action": {
|
|
@@ -117,7 +117,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/containers/prune": {
|
|
+ "admin/dockerman/containers/prune": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -133,17 +133,17 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/container": {
|
|
+ "admin/dockerman/container": {
|
|
"action": {
|
|
"type": "alias",
|
|
- "path": "admin/services/dockerman/containers"
|
|
+ "path": "admin/dockerman/containers"
|
|
},
|
|
"depends": {
|
|
"acl": [ "luci-app-dockerman" ]
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/container_new": {
|
|
+ "admin/dockerman/container_new": {
|
|
"title_hide": "Container",
|
|
"action": {
|
|
"type": "view",
|
|
@@ -154,7 +154,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/images/build": {
|
|
+ "admin/dockerman/images/build": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -170,7 +170,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/images/build/prune": {
|
|
+ "admin/dockerman/images/build/prune": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -186,7 +186,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/images/get/*": {
|
|
+ "admin/dockerman/images/get/*": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -201,7 +201,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/images/load": {
|
|
+ "admin/dockerman/images/load": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -217,7 +217,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/images/prune": {
|
|
+ "admin/dockerman/images/prune": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -233,7 +233,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/images": {
|
|
+ "admin/dockerman/images": {
|
|
"title": "Images",
|
|
"order": 4,
|
|
"action": {
|
|
@@ -242,7 +242,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/images/create": {
|
|
+ "admin/dockerman/images/create": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -258,7 +258,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/images/push/*": {
|
|
+ "admin/dockerman/images/push/*": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -274,17 +274,17 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/image": {
|
|
+ "admin/dockerman/image": {
|
|
"action": {
|
|
"type": "alias",
|
|
- "path": "admin/services/dockerman/images"
|
|
+ "path": "admin/dockerman/images"
|
|
},
|
|
"depends": {
|
|
"acl": [ "luci-app-dockerman" ]
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/network/*": {
|
|
+ "admin/dockerman/network/*": {
|
|
"title_hide": "Network",
|
|
"action": {
|
|
"type": "view",
|
|
@@ -295,7 +295,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/networks": {
|
|
+ "admin/dockerman/networks": {
|
|
"title": "Networks",
|
|
"order": 5,
|
|
"action": {
|
|
@@ -307,7 +307,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/networks/prune": {
|
|
+ "admin/dockerman/networks/prune": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -323,7 +323,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/network_new": {
|
|
+ "admin/dockerman/network_new": {
|
|
"title_hide": "Network",
|
|
"action": {
|
|
"type": "view",
|
|
@@ -334,17 +334,17 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/network": {
|
|
+ "admin/dockerman/network": {
|
|
"action": {
|
|
"type": "alias",
|
|
- "path": "admin/services/dockerman/networks"
|
|
+ "path": "admin/dockerman/networks"
|
|
},
|
|
"depends": {
|
|
"acl": [ "luci-app-dockerman" ]
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/volumes": {
|
|
+ "admin/dockerman/volumes": {
|
|
"title": "Volumes",
|
|
"order": 6,
|
|
"action": {
|
|
@@ -356,7 +356,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/volumes/prune": {
|
|
+ "admin/dockerman/volumes/prune": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -372,7 +372,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/docker/events": {
|
|
+ "admin/dockerman/docker/events": {
|
|
"action": {
|
|
"type": "function",
|
|
"module": "luci.controller.docker",
|
|
@@ -388,7 +388,7 @@
|
|
}
|
|
},
|
|
|
|
- "admin/services/dockerman/events": {
|
|
+ "admin/dockerman/events": {
|
|
"title": "Events",
|
|
"order": 7,
|
|
"action": {
|
|
|
|
--- a/luci-app-dockerman/htdocs/luci-static/resources/dockerman/common.js
|
|
+++ b/luci-app-dockerman/htdocs/luci-static/resources/dockerman/common.js
|
|
@@ -437,7 +437,7 @@ const dv = view.extend({
|
|
outputText: '', // Initialize output text
|
|
|
|
get dockerman_url() {
|
|
- return L.url('admin/services/dockerman');
|
|
+ return L.url('admin/dockerman');
|
|
},
|
|
|
|
parseHeaders(headers, array) {
|
|
|
|
--- /dev/null
|
|
+++ b/luci-app-dockerman/root/etc/uci-defaults/luci-app-dockerman
|
|
@@ -0,0 +1,8 @@
|
|
+#!/bin/sh
|
|
+
|
|
+uci -q batch <<-EOF >/dev/null
|
|
+ set uhttpd.main.script_timeout="360"
|
|
+ commit uhttpd
|
|
+EOF
|
|
+
|
|
+/etc/init.d/dockerd restart
|
|
|
|
--- a/luci-app-dockerman/htdocs/luci-static/resources/view/dockerman/configuration.js
|
|
+++ b/luci-app-dockerman/htdocs/luci-static/resources/view/dockerman/configuration.js
|
|
@@ -66,6 +66,7 @@ return L.view.extend({
|
|
o.value('https://docker.io');
|
|
o.value('https://ghcr.io');
|
|
o.value('https://hub-mirror.c.163.com');
|
|
+ o.value('https://ustc-edu-cn.mirror.aliyuncs.com');
|
|
|
|
o = s.taboption('globals', form.ListValue, 'log_level',
|
|
_('Log Level'),
|