mirror of
https://github.com/kenzok8/small-package
synced 2025-01-08 11:17:34 +08:00
update-09.27
This commit is contained in:
parent
a05d3fbfbb
commit
c405e032fb
@ -1,7 +1,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=aliyundrive-webdav
|
||||
PKG_VERSION:=0.2.1
|
||||
PKG_VERSION:=0.3.0
|
||||
PKG_RELEASE:=1
|
||||
|
||||
PKG_LICENSE:=MIT
|
||||
|
@ -1,7 +1,7 @@
|
||||
include $(TOPDIR)/rules.mk
|
||||
|
||||
PKG_NAME:=luci-app-aliyundrive-webdav
|
||||
PKG_VERSION:=0.2.1
|
||||
PKG_VERSION:=0.3.0
|
||||
PKG_RELEASE:=1
|
||||
PKG_PO_VERSION:=$(PKG_VERSION)-$(PKG_RELEASE)
|
||||
|
||||
|
@ -14,7 +14,7 @@ PKG_LICENSE:=AGPL-3.0
|
||||
PKG_MAINTAINER:=lisaac <lisaac.cn@gmail.com> \
|
||||
Florian Eckert <fe@dev.tdt.de>
|
||||
|
||||
PKG_VERSION:=v0.5.23-2
|
||||
PKG_VERSION:=v0.5.23-3
|
||||
|
||||
include $(TOPDIR)/feeds/luci/luci.mk
|
||||
|
||||
|
@ -120,7 +120,8 @@ if nixio.fs.access("/usr/bin/dockerd") and not m.uci:get_bool("dockerd", "docker
|
||||
for i, v in ipairs(interfaces) do
|
||||
o:value(v, v)
|
||||
end
|
||||
o = s:taboption("ac", DynamicList, "ac_allowed_container", translate("Containers allowed to be accessed"), translate("Which container(s) under bridge network can be accessed, even from interfaces that are not allowed, fill-in Container Id or Name"))
|
||||
o = s:taboption("ac", DynamicList, "ac_allowed_ports", translate("Ports allowed to be accessed"), translate("Which Port(s) can be accessed, it's not restricted by the Allowed Access interfaces configuration. Use this configuration with caution!"))
|
||||
o.placeholder = "8080/tcp"
|
||||
local docker = require "luci.model.docker"
|
||||
local containers, res, lost_state
|
||||
local dk = docker.new()
|
||||
@ -137,8 +138,12 @@ if nixio.fs.access("/usr/bin/dockerd") and not m.uci:get_bool("dockerd", "docker
|
||||
-- allowed_container.placeholder = "container name_or_id"
|
||||
if containers then
|
||||
for i, v in ipairs(containers) do
|
||||
if v.State == "running" and v.NetworkSettings and v.NetworkSettings.Networks and v.NetworkSettings.Networks.bridge and v.NetworkSettings.Networks.bridge.IPAddress then
|
||||
o:value(v.Id:sub(1,12), v.Names[1]:sub(2) .. " | " .. v.NetworkSettings.Networks.bridge.IPAddress)
|
||||
if v.State == "running" and v.Ports then
|
||||
for _, port in ipairs(v.Ports) do
|
||||
if port.PublicPort and port.IP and not string.find(port.IP,":") then
|
||||
o:value(port.PublicPort.."/"..port.Type, v.Names[1]:sub(2) .. " | " .. port.PublicPort .. " | " .. port.Type)
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -1,7 +1,7 @@
|
||||
msgid ""
|
||||
msgstr "Content-Type: text/plain; charset=UTF-8"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:621
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:619
|
||||
msgid "A list of kernel capabilities to add to the container"
|
||||
msgstr ""
|
||||
|
||||
@ -13,15 +13,15 @@ msgstr ""
|
||||
msgid "Add"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:597
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:595
|
||||
msgid "Add host device to the container"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:573
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:571
|
||||
msgid "Advance"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:588
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:586
|
||||
msgid "Allocates an ephemeral host port for all of a container's exposed ports"
|
||||
msgstr ""
|
||||
|
||||
@ -29,7 +29,7 @@ msgstr ""
|
||||
msgid "Allowed access interfaces"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:500
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:498
|
||||
msgid "Always pull image first"
|
||||
msgstr ""
|
||||
|
||||
@ -59,20 +59,20 @@ msgstr ""
|
||||
msgid "Base device"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:555
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:553
|
||||
msgid "Bind Mount(-v)"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:556
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:554
|
||||
msgid "Bind mount a volume"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:596
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:654
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:652
|
||||
msgid "Block IO Weight"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:655
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:653
|
||||
msgid ""
|
||||
"Block IO weight (relative weight) accepts a weight value between 10 and 1000"
|
||||
msgstr ""
|
||||
@ -96,12 +96,12 @@ msgid ""
|
||||
"image can be downloaded from the configured registry."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:620
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:618
|
||||
msgid "CAP-ADD(--cap-add)"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:581
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:637
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:635
|
||||
msgid "CPU Shares Weight"
|
||||
msgstr ""
|
||||
|
||||
@ -109,7 +109,7 @@ msgstr ""
|
||||
msgid "CPU Useage"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:638
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:636
|
||||
msgid ""
|
||||
"CPU shares relative weight, if 0 is set, the system will ignore the value "
|
||||
"and use the default of 1024"
|
||||
@ -122,7 +122,7 @@ msgid ""
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:573
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:628
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:626
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua:44
|
||||
msgid "CPUs"
|
||||
msgstr ""
|
||||
@ -192,7 +192,7 @@ msgstr ""
|
||||
msgid "Container Logs"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:475
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:473
|
||||
msgid "Container Name"
|
||||
msgstr ""
|
||||
|
||||
@ -210,15 +210,11 @@ msgstr ""
|
||||
msgid "Containers"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/configuration.lua:123
|
||||
msgid "Containers allowed to be accessed"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:94
|
||||
msgid "Create macvlan interface"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:467
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:465
|
||||
msgid "Create new docker container"
|
||||
msgstr ""
|
||||
|
||||
@ -252,7 +248,7 @@ msgstr ""
|
||||
msgid "Device"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:596
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:594
|
||||
msgid "Device(--device)"
|
||||
msgstr ""
|
||||
|
||||
@ -273,7 +269,7 @@ msgid "Docker - Container (%s)"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:128
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:452
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:450
|
||||
msgid "Docker - Containers"
|
||||
msgstr ""
|
||||
|
||||
@ -305,7 +301,7 @@ msgstr ""
|
||||
msgid "Docker Daemon settings"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:491
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
|
||||
msgid "Docker Image"
|
||||
msgstr ""
|
||||
|
||||
@ -360,7 +356,7 @@ msgstr ""
|
||||
msgid "Env"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:548
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:546
|
||||
msgid "Environmental Variable(-e)"
|
||||
msgstr ""
|
||||
|
||||
@ -381,11 +377,11 @@ msgstr ""
|
||||
msgid "Export"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:587
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:585
|
||||
msgid "Exposed All Ports(-P)"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:562
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:560
|
||||
msgid "Exposed Ports(-p)"
|
||||
msgstr ""
|
||||
|
||||
@ -426,7 +422,7 @@ msgstr ""
|
||||
msgid "Healthy"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:578
|
||||
msgid "Host Name"
|
||||
msgstr ""
|
||||
|
||||
@ -448,7 +444,7 @@ msgstr ""
|
||||
msgid "IP range"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:524
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:522
|
||||
msgid "IPv4 Address"
|
||||
msgstr ""
|
||||
|
||||
@ -506,7 +502,7 @@ msgstr ""
|
||||
msgid "Inspect"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:479
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:477
|
||||
msgid "Interactive (-i)"
|
||||
msgstr ""
|
||||
|
||||
@ -540,7 +536,7 @@ msgstr ""
|
||||
msgid "Links"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:529
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:527
|
||||
msgid "Links with other containers"
|
||||
msgstr ""
|
||||
|
||||
@ -553,7 +549,7 @@ msgstr ""
|
||||
msgid "Log Level"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:663
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:661
|
||||
msgid "Log driver options"
|
||||
msgstr ""
|
||||
|
||||
@ -566,7 +562,7 @@ msgid "MAC VLAN"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:589
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:646
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:644
|
||||
msgid "Memory"
|
||||
msgstr ""
|
||||
|
||||
@ -574,7 +570,7 @@ msgstr ""
|
||||
msgid "Memory Useage"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:647
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:645
|
||||
msgid ""
|
||||
"Memory limit (format: <number>[<unit>]). Number is a positive integer. Unit "
|
||||
"can be one of b, k, m, or g. Minimum is 4M"
|
||||
@ -594,7 +590,7 @@ msgstr ""
|
||||
msgid "Mount Point"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:605
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
|
||||
msgid "Mount tmpfs directory"
|
||||
msgstr ""
|
||||
|
||||
@ -628,7 +624,7 @@ msgid "Network Name"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:40
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:520
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:518
|
||||
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:169
|
||||
msgid "Networks"
|
||||
msgstr ""
|
||||
@ -646,7 +642,7 @@ msgstr ""
|
||||
msgid "New tag"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:629
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:627
|
||||
msgid "Number of CPUs. Number is a fractional number. 0.000 means no limit"
|
||||
msgstr ""
|
||||
|
||||
@ -713,15 +709,19 @@ msgstr ""
|
||||
msgid "Ports"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/configuration.lua:124
|
||||
msgid "Ports allowed to be accessed"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:62
|
||||
msgid "Private (Prevent communication between MAC VLANs)"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:506
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:504
|
||||
msgid "Privileged"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:563
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:561
|
||||
msgid "Publish container's port(s) to the host"
|
||||
msgstr ""
|
||||
|
||||
@ -772,7 +772,7 @@ msgstr ""
|
||||
msgid "RepoTags"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:471
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:469
|
||||
msgid "Resolve CLI"
|
||||
msgstr ""
|
||||
|
||||
@ -788,7 +788,7 @@ msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:334
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:427
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:512
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:510
|
||||
msgid "Restart Policy"
|
||||
msgstr ""
|
||||
|
||||
@ -800,7 +800,7 @@ msgstr ""
|
||||
msgid "Reveal/hide password"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:568
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:566
|
||||
msgid "Run command"
|
||||
msgstr ""
|
||||
|
||||
@ -808,11 +808,11 @@ msgstr ""
|
||||
msgid "Save"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:535
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:533
|
||||
msgid "Set custom DNS servers"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:549
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:547
|
||||
msgid "Set environment variables to inside the container"
|
||||
msgstr ""
|
||||
|
||||
@ -870,11 +870,11 @@ msgstr ""
|
||||
msgid "Sysctl"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:612
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:610
|
||||
msgid "Sysctl(--sysctl)"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:613
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:611
|
||||
msgid "Sysctls (kernel parameters) options"
|
||||
msgstr ""
|
||||
|
||||
@ -882,7 +882,7 @@ msgstr ""
|
||||
msgid "TOP"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:485
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:483
|
||||
msgid "TTY (-t)"
|
||||
msgstr ""
|
||||
|
||||
@ -890,15 +890,15 @@ msgstr ""
|
||||
msgid "TX/RX"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:581
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:579
|
||||
msgid "The hostname to use for the container"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:664
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:662
|
||||
msgid "The logging configuration for this container"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:542
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:540
|
||||
msgid ""
|
||||
"The user that commands are run as inside the container.(format: name|uid[:"
|
||||
"group|gid])"
|
||||
@ -920,7 +920,7 @@ msgstr ""
|
||||
msgid "Tmpfs"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:604
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:602
|
||||
msgid "Tmpfs(--tmpfs)"
|
||||
msgstr ""
|
||||
|
||||
@ -962,7 +962,7 @@ msgstr ""
|
||||
msgid "User"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:541
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:539
|
||||
msgid "User(-u)"
|
||||
msgstr ""
|
||||
|
||||
@ -989,10 +989,10 @@ msgid ""
|
||||
"system and a valid image tar can be downloaded from remote."
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/configuration.lua:123
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/configuration.lua:124
|
||||
msgid ""
|
||||
"Which container(s) under bridge network can be accessed, even from "
|
||||
"interfaces that are not allowed, fill-in Container Id or Name"
|
||||
"Which Port(s) can be accessed, it's not restricted by the Allowed Access "
|
||||
"interfaces configuration. Use this configuration with caution!"
|
||||
msgstr ""
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/configuration.lua:118
|
||||
|
@ -10,7 +10,7 @@ msgstr ""
|
||||
"Plural-Forms: nplurals=1; plural=0;\n"
|
||||
"X-Generator: Weblate 4.5.2-dev\n"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:621
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:619
|
||||
msgid "A list of kernel capabilities to add to the container"
|
||||
msgstr "要添加到容器的内核功能列表"
|
||||
|
||||
@ -22,15 +22,15 @@ msgstr "访问控制"
|
||||
msgid "Add"
|
||||
msgstr "新增"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:597
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:595
|
||||
msgid "Add host device to the container"
|
||||
msgstr "将主机设备添加到容器"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:573
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:571
|
||||
msgid "Advance"
|
||||
msgstr "高级选项"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:588
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:586
|
||||
msgid "Allocates an ephemeral host port for all of a container's exposed ports"
|
||||
msgstr "为容器的所有暴露端口分配临时主机端口"
|
||||
|
||||
@ -38,7 +38,7 @@ msgstr "为容器的所有暴露端口分配临时主机端口"
|
||||
msgid "Allowed access interfaces"
|
||||
msgstr "允许的访问接口"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:500
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:498
|
||||
msgid "Always pull image first"
|
||||
msgstr "总是先拉取镜像"
|
||||
|
||||
@ -68,20 +68,20 @@ msgstr "可用"
|
||||
msgid "Base device"
|
||||
msgstr "基设备"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:555
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:553
|
||||
msgid "Bind Mount(-v)"
|
||||
msgstr "绑定挂载(-v)"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:556
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:554
|
||||
msgid "Bind mount a volume"
|
||||
msgstr "绑定挂载卷"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:596
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:654
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:652
|
||||
msgid "Block IO Weight"
|
||||
msgstr "块 IO 权重"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:655
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:653
|
||||
msgid ""
|
||||
"Block IO weight (relative weight) accepts a weight value between 10 and 1000"
|
||||
msgstr "块 IO 权重(相对权重)接受10到1000之间的数值"
|
||||
@ -103,14 +103,16 @@ msgstr "Bridge device"
|
||||
msgid ""
|
||||
"By entering a valid image name with the corresponding version, the docker "
|
||||
"image can be downloaded from the configured registry."
|
||||
msgstr "通过输入具有相应版本的有效映像名称,可以从镜像存储中心(Registry)中下载docker映像。"
|
||||
msgstr ""
|
||||
"通过输入具有相应版本的有效映像名称,可以从镜像存储中心(Registry)中下载"
|
||||
"docker映像。"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:620
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:618
|
||||
msgid "CAP-ADD(--cap-add)"
|
||||
msgstr "权限控制(--cap-add)"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:581
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:637
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:635
|
||||
msgid "CPU Shares Weight"
|
||||
msgstr "CPU 共享权重"
|
||||
|
||||
@ -118,7 +120,7 @@ msgstr "CPU 共享权重"
|
||||
msgid "CPU Useage"
|
||||
msgstr "CPU 使用率"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:638
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:636
|
||||
msgid ""
|
||||
"CPU shares relative weight, if 0 is set, the system will ignore the value "
|
||||
"and use the default of 1024"
|
||||
@ -131,7 +133,7 @@ msgid ""
|
||||
msgstr "CPU 共享相对权重,如果设置为 0,则系统将忽略该值并使用默认值 1024。"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:573
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:628
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:626
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua:44
|
||||
msgid "CPUs"
|
||||
msgstr "线程数量"
|
||||
@ -201,7 +203,7 @@ msgstr "检查容器"
|
||||
msgid "Container Logs"
|
||||
msgstr "容器日志"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:475
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:473
|
||||
msgid "Container Name"
|
||||
msgstr "容器名称"
|
||||
|
||||
@ -219,15 +221,11 @@ msgstr "容器详情"
|
||||
msgid "Containers"
|
||||
msgstr "容器"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/configuration.lua:123
|
||||
msgid "Containers allowed to be accessed"
|
||||
msgstr "允许访问的容器"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:94
|
||||
msgid "Create macvlan interface"
|
||||
msgstr "创建 macvlan 接口"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:467
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:465
|
||||
msgid "Create new docker container"
|
||||
msgstr "创建 docker 容器"
|
||||
|
||||
@ -261,7 +259,7 @@ msgstr "默认桥接"
|
||||
msgid "Device"
|
||||
msgstr "设备"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:596
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:594
|
||||
msgid "Device(--device)"
|
||||
msgstr "设备(--device)"
|
||||
|
||||
@ -282,7 +280,7 @@ msgid "Docker - Container (%s)"
|
||||
msgstr "Docker - 容器 (%s)"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:128
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:452
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:450
|
||||
msgid "Docker - Containers"
|
||||
msgstr "Docker - 容器"
|
||||
|
||||
@ -314,7 +312,7 @@ msgstr "Docker - 存储卷"
|
||||
msgid "Docker Daemon settings"
|
||||
msgstr "Docker 服务端(Docker Daemon)设置"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:491
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:489
|
||||
msgid "Docker Image"
|
||||
msgstr "Docker 镜像"
|
||||
|
||||
@ -369,7 +367,7 @@ msgstr "启用 IPv6"
|
||||
msgid "Env"
|
||||
msgstr "环境变量"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:548
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:546
|
||||
msgid "Environmental Variable(-e)"
|
||||
msgstr "环境变量(-e)"
|
||||
|
||||
@ -390,11 +388,11 @@ msgstr "排除 IP"
|
||||
msgid "Export"
|
||||
msgstr "导出"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:587
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:585
|
||||
msgid "Exposed All Ports(-P)"
|
||||
msgstr "暴露所有端口(-P)"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:562
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:560
|
||||
msgid "Exposed Ports(-p)"
|
||||
msgstr "暴露端口(-p)"
|
||||
|
||||
@ -435,7 +433,7 @@ msgstr "授予 UCI 访问 luci-app-dockerman 的权限"
|
||||
msgid "Healthy"
|
||||
msgstr "健康"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:580
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:578
|
||||
msgid "Host Name"
|
||||
msgstr "主机名"
|
||||
|
||||
@ -457,7 +455,7 @@ msgstr "IP VLAN"
|
||||
msgid "IP range"
|
||||
msgstr "IP 范围"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:524
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:522
|
||||
msgid "IPv4 Address"
|
||||
msgstr "IPv4 地址"
|
||||
|
||||
@ -515,7 +513,7 @@ msgstr "入口网络是以群模式提供路由网格的网络"
|
||||
msgid "Inspect"
|
||||
msgstr "检查"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:479
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:477
|
||||
msgid "Interactive (-i)"
|
||||
msgstr "交互(-i)"
|
||||
|
||||
@ -530,7 +528,9 @@ msgstr "Ipvlan 模式"
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/configuration.lua:43
|
||||
msgid ""
|
||||
"It replaces the daemon registry mirrors with a new set of registry mirrors"
|
||||
msgstr "设置新的镜像存储中心(Registry)镜像源,这将取代服务端(daemon)配置的镜像存储中心(Registry)的镜像源"
|
||||
msgstr ""
|
||||
"设置新的镜像存储中心(Registry)镜像源,这将取代服务端(daemon)配置的镜像存"
|
||||
"储中心(Registry)的镜像源"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:238
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:264
|
||||
@ -549,7 +549,7 @@ msgstr "L3 桥接"
|
||||
msgid "Links"
|
||||
msgstr "链接"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:529
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:527
|
||||
msgid "Links with other containers"
|
||||
msgstr "与其他容器的链接"
|
||||
|
||||
@ -562,7 +562,7 @@ msgstr "负载"
|
||||
msgid "Log Level"
|
||||
msgstr "日志等级"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:663
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:661
|
||||
msgid "Log driver options"
|
||||
msgstr "日志驱动选项"
|
||||
|
||||
@ -575,7 +575,7 @@ msgid "MAC VLAN"
|
||||
msgstr "MAC VLAN"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:589
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:646
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:644
|
||||
msgid "Memory"
|
||||
msgstr "内存"
|
||||
|
||||
@ -583,7 +583,7 @@ msgstr "内存"
|
||||
msgid "Memory Useage"
|
||||
msgstr "内存使用率"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:647
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:645
|
||||
msgid ""
|
||||
"Memory limit (format: <number>[<unit>]). Number is a positive integer. Unit "
|
||||
"can be one of b, k, m, or g. Minimum is 4M"
|
||||
@ -607,7 +607,7 @@ msgstr "模式"
|
||||
msgid "Mount Point"
|
||||
msgstr "挂载点"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:605
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:603
|
||||
msgid "Mount tmpfs directory"
|
||||
msgstr "挂载 tmpfs 目录"
|
||||
|
||||
@ -641,7 +641,7 @@ msgid "Network Name"
|
||||
msgstr "网络名称"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/controller/dockerman.lua:40
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:520
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:518
|
||||
#: applications/luci-app-dockerman/luasrc/view/dockerman/overview.htm:169
|
||||
msgid "Networks"
|
||||
msgstr "网络"
|
||||
@ -659,7 +659,7 @@ msgstr "新建"
|
||||
msgid "New tag"
|
||||
msgstr "新建标签"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:629
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:627
|
||||
msgid "Number of CPUs. Number is a fractional number. 0.000 means no limit"
|
||||
msgstr "CPU 数量。数字是小数。0.000 表示没有限制"
|
||||
|
||||
@ -726,15 +726,19 @@ msgstr "请输入 <docker create/run> 的命令行:"
|
||||
msgid "Ports"
|
||||
msgstr "端口"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/configuration.lua:124
|
||||
msgid "Ports allowed to be accessed"
|
||||
msgstr "允许访问的端口"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newnetwork.lua:62
|
||||
msgid "Private (Prevent communication between MAC VLANs)"
|
||||
msgstr "专用(阻止 MAC VLAN 之间的通信)"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:506
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:504
|
||||
msgid "Privileged"
|
||||
msgstr "特权模式"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:563
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:561
|
||||
msgid "Publish container's port(s) to the host"
|
||||
msgstr "将容器的端口发布到主机"
|
||||
|
||||
@ -785,7 +789,7 @@ msgstr "重命名"
|
||||
msgid "RepoTags"
|
||||
msgstr "仓库标签"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:471
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:469
|
||||
msgid "Resolve CLI"
|
||||
msgstr "解析 CLI"
|
||||
|
||||
@ -801,7 +805,7 @@ msgstr "重新启动"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:334
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:427
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:512
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:510
|
||||
msgid "Restart Policy"
|
||||
msgstr "重启策略"
|
||||
|
||||
@ -813,7 +817,7 @@ msgstr "限制外部网络访问"
|
||||
msgid "Reveal/hide password"
|
||||
msgstr "显示/隐藏 密码"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:568
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:566
|
||||
msgid "Run command"
|
||||
msgstr "运行命令"
|
||||
|
||||
@ -821,11 +825,11 @@ msgstr "运行命令"
|
||||
msgid "Save"
|
||||
msgstr "保存"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:535
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:533
|
||||
msgid "Set custom DNS servers"
|
||||
msgstr "设置自定义 DNS 服务器"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:549
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:547
|
||||
msgid "Set environment variables to inside the container"
|
||||
msgstr "在容器内部设置环境变量"
|
||||
|
||||
@ -842,7 +846,8 @@ msgid ""
|
||||
"Specifies where the Docker daemon will listen for client connections "
|
||||
"(default: unix:///var/run/docker.sock)"
|
||||
msgstr ""
|
||||
"指定Docker服务端(Docker daemon)将在何处侦听客户端连接(默认: unix:///var/run/docker.sock)"
|
||||
"指定Docker服务端(Docker daemon)将在何处侦听客户端连接(默认: unix:///var/"
|
||||
"run/docker.sock)"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/container.lua:211
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/containers.lua:234
|
||||
@ -884,11 +889,11 @@ msgstr "子网"
|
||||
msgid "Sysctl"
|
||||
msgstr "系统控制"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:612
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:610
|
||||
msgid "Sysctl(--sysctl)"
|
||||
msgstr "系统控制(--sysctl)"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:613
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:611
|
||||
msgid "Sysctls (kernel parameters) options"
|
||||
msgstr "系统控制(内核参数)选项"
|
||||
|
||||
@ -896,7 +901,7 @@ msgstr "系统控制(内核参数)选项"
|
||||
msgid "TOP"
|
||||
msgstr "TOP"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:485
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:483
|
||||
msgid "TTY (-t)"
|
||||
msgstr "TTY(-t)"
|
||||
|
||||
@ -904,15 +909,15 @@ msgstr "TTY(-t)"
|
||||
msgid "TX/RX"
|
||||
msgstr "发射/接收"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:581
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:579
|
||||
msgid "The hostname to use for the container"
|
||||
msgstr "容器使用的主机名"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:664
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:662
|
||||
msgid "The logging configuration for this container"
|
||||
msgstr "该容器的日志记录配置"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:542
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:540
|
||||
msgid ""
|
||||
"The user that commands are run as inside the container.(format: name|uid[:"
|
||||
"group|gid])"
|
||||
@ -934,7 +939,7 @@ msgstr "此页面显示在已连接的Docker主机上创建的所有Docker网络
|
||||
msgid "Tmpfs"
|
||||
msgstr "Tmpfs"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:604
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:602
|
||||
msgid "Tmpfs(--tmpfs)"
|
||||
msgstr "Tmpfs(--tmpfs)"
|
||||
|
||||
@ -976,7 +981,7 @@ msgstr "上传/下载"
|
||||
msgid "User"
|
||||
msgstr "用户"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:541
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:539
|
||||
msgid "User(-u)"
|
||||
msgstr "用户(-u)"
|
||||
|
||||
@ -1005,12 +1010,11 @@ msgstr ""
|
||||
"按下导入按钮时,既可以将本地镜像文件加载到系统上,也可以从远程下载有效的Tar格"
|
||||
"式的镜像文件。"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/configuration.lua:123
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/configuration.lua:124
|
||||
msgid ""
|
||||
"Which container(s) under bridge network can be accessed, even from "
|
||||
"interfaces that are not allowed, fill-in Container Id or Name"
|
||||
msgstr ""
|
||||
"桥接网络下哪些容器可以访问,即使是不允许从接口访问,也要填写容器 ID 或名称"
|
||||
"Which Port(s) can be accessed, it's not restricted by the Allowed Access "
|
||||
"interfaces configuration. Use this configuration with caution!"
|
||||
msgstr "设置可以被访问的端口,该配置不受“允许的访问接口”配置的限制。请谨慎使用该配置选项!"
|
||||
|
||||
#: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/configuration.lua:118
|
||||
msgid ""
|
||||
@ -1018,6 +1022,15 @@ msgid ""
|
||||
"Interface Name"
|
||||
msgstr "哪些接口可以访问桥接网络下的容器,请填写接口名称"
|
||||
|
||||
#~ msgid "Containers allowed to be accessed"
|
||||
#~ msgstr "允许访问的容器"
|
||||
|
||||
#~ msgid ""
|
||||
#~ "Which container(s) under bridge network can be accessed, even from "
|
||||
#~ "interfaces that are not allowed, fill-in Container Id or Name"
|
||||
#~ msgstr ""
|
||||
#~ "桥接网络下哪些容器可以访问,即使是不允许从接口访问,也要填写容器 ID 或名称"
|
||||
|
||||
#~ msgid "Connect to remote endpoint"
|
||||
#~ msgstr "连接到远程终端"
|
||||
|
||||
|
@ -5,12 +5,65 @@ USE_PROCD=1
|
||||
# PROCD_DEBUG=1
|
||||
config_load 'dockerd'
|
||||
# config_get daemon_ea "dockerman" daemon_ea
|
||||
_DOCKERD=/etc/init.d/dockerd
|
||||
|
||||
docker_running(){
|
||||
docker version > /dev/null 2>&1
|
||||
return $?
|
||||
}
|
||||
|
||||
add_ports() {
|
||||
[ $# -eq 0 ] && return
|
||||
$($_DOCKERD running) && docker_running || return 1
|
||||
ids=$@
|
||||
for id in $ids; do
|
||||
id=$(docker ps --filter "ID=$id" --quiet)
|
||||
[ -z "$id" ] && {
|
||||
echo "Docker containner not running";
|
||||
return 1;
|
||||
}
|
||||
ports=$(docker ps --filter "ID=$id" --format "{{.Ports}}")
|
||||
# echo "$ports"
|
||||
for port in $ports; do
|
||||
echo "$port" | grep -qE "^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}:.*$" || continue;
|
||||
[ "${port: -1}" == "," ] && port="${port:0:-1}"
|
||||
local protocol=""
|
||||
[ "${port%tcp}" != "$port" ] && protocol="/tcp"
|
||||
[ "${port%udp}" != "$port" ] && protocol="/udp"
|
||||
[ "$protocol" == "" ] && continue
|
||||
port="${port%%->*}"
|
||||
port="${port##*:}"
|
||||
uci_add_list dockerd dockerman ac_allowed_ports "${port}${protocol}"
|
||||
done
|
||||
done
|
||||
uci_commit dockerd
|
||||
}
|
||||
|
||||
|
||||
convert() {
|
||||
_convert() {
|
||||
_id=$1
|
||||
_id=$(docker ps --all --filter "ID=$_id" --quiet)
|
||||
if [ -z "$_id" ]; then
|
||||
uci_remove_list dockerd dockerman ac_allowed_container "$1"
|
||||
return
|
||||
fi
|
||||
if /etc/init.d/dockerman add_ports "$_id"; then
|
||||
uci_remove_list dockerd dockerman ac_allowed_container "$_id"
|
||||
fi
|
||||
}
|
||||
config_list_foreach dockerman ac_allowed_container _convert
|
||||
uci_commit dockerd
|
||||
}
|
||||
|
||||
iptables_append(){
|
||||
# Wait for a maximum of 10 second per command, retrying every millisecond
|
||||
local iptables_wait_args="--wait 10 --wait-interval 1000"
|
||||
if ! iptables ${iptables_wait_args} --check $@ 2>/dev/null; then
|
||||
iptables ${iptables_wait_args} -A $@ 2>/dev/null
|
||||
fi
|
||||
}
|
||||
|
||||
init_dockerman_chain(){
|
||||
iptables -N DOCKER-MAN >/dev/null 2>&1
|
||||
iptables -F DOCKER-MAN >/dev/null 2>&1
|
||||
@ -25,35 +78,36 @@ delete_dockerman_chain(){
|
||||
}
|
||||
|
||||
add_allowed_interface(){
|
||||
iptables -A DOCKER-MAN -i $1 -o docker0 -j RETURN
|
||||
iptables_append DOCKER-MAN -i $1 -o docker0 -j RETURN
|
||||
}
|
||||
|
||||
add_allowed_container(){
|
||||
ip=$(docker inspect --format '{{range.NetworkSettings.Networks}}{{.IPAddress}}{{end}}' ${1} 2>/dev/null)
|
||||
[ -n "$ip" ] && iptables -A DOCKER-MAN -d $ip -o docker0 -j ACCEPT
|
||||
add_allowed_ports(){
|
||||
port=$1
|
||||
if [ "${port%/tcp}" != "$port" ]; then
|
||||
iptables_append DOCKER-MAN -p tcp -m conntrack --ctorigdstport ${port%/tcp} --ctdir ORIGINAL -j RETURN
|
||||
elif [ "${port%/udp}" != "$port" ]; then
|
||||
iptables_append DOCKER-MAN -p udp -m conntrack --ctorigdstport ${port%/udp} --ctdir ORIGINAL -j RETURN
|
||||
fi
|
||||
}
|
||||
|
||||
handle_allowed_container(){
|
||||
config_list_foreach "dockerman" "ac_allowed_container" add_allowed_container
|
||||
handle_allowed_ports(){
|
||||
config_list_foreach "dockerman" "ac_allowed_ports" add_allowed_ports
|
||||
}
|
||||
|
||||
handle_allowed_interface(){
|
||||
#config_list_foreach "dockerman" allowed_ip add_allowed_ip
|
||||
config_list_foreach "dockerman" "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
|
||||
iptables_append DOCKER-MAN -m conntrack --ctstate ESTABLISHED,RELATED -o docker0 -j RETURN >/dev/null 2>&1
|
||||
iptables_append DOCKER-MAN -m conntrack --ctstate NEW,INVALID -o docker0 -j DROP >/dev/null 2>&1
|
||||
iptables_append DOCKER-MAN -j RETURN >/dev/null 2>&1
|
||||
}
|
||||
|
||||
start_service(){
|
||||
_DOCKERD=/etc/init.d/dockerd
|
||||
[ -x "$_DOCKERD" ] && $($_DOCKERD enabled) || return 0
|
||||
delete_dockerman_chain
|
||||
$($_DOCKERD running) && docker_running || return 0
|
||||
init_dockerman_chain
|
||||
# handle_allowed_container
|
||||
handle_allowed_ports
|
||||
handle_allowed_interface
|
||||
lua /usr/share/dockerman/dockerd-ac.lua
|
||||
}
|
||||
|
||||
stop_service(){
|
||||
@ -72,3 +126,6 @@ boot() {
|
||||
sleep 5s
|
||||
start
|
||||
}
|
||||
|
||||
extra_command "add_ports" "Add allowed ports based on the container ID(s)"
|
||||
extra_command "convert" "Convert Ac allowed container to AC allowed ports"
|
||||
|
@ -1,15 +1,17 @@
|
||||
#!/bin/sh
|
||||
|
||||
. $IPKG_INSTROOT/lib/functions.sh
|
||||
|
||||
[ -x "$(command -v dockerd)" ] && chmod +x /etc/init.d/dockerman && /etc/init.d/dockerman enable >/dev/null 2>&1
|
||||
sed -i 's/self:cfgvalue(section) or {}/self:cfgvalue(section) or self.default or {}/' /usr/lib/lua/luci/view/cbi/dynlist.htm
|
||||
/etc/init.d/uhttpd restart >/dev/null 2>&1
|
||||
rm -fr /tmp/luci-indexcache /tmp/luci-modulecache >/dev/null 2>&1
|
||||
touch /etc/config/dockerd
|
||||
ls /etc/rc.d/*dockerd &> /dev/null && uci set dockerd.globals.auto_start="1" || uci set dockerd.globals.auto_start="0"
|
||||
uci set dockerd.dockerman=dockerman &> /dev/null
|
||||
ls /etc/rc.d/*dockerd &> /dev/null && uci -q set dockerd.globals.auto_start="1" || uci -q set dockerd.globals.auto_start="0"
|
||||
uci -q batch <<-EOF >/dev/null
|
||||
set uhttpd.main.script_timeout="3600"
|
||||
commit uhttpd
|
||||
set dockerd.dockerman=dockerman
|
||||
set dockerd.dockerman.socket_path='/var/run/docker.sock'
|
||||
set dockerd.dockerman.status_path='/tmp/.docker_action_status'
|
||||
set dockerd.dockerman.debug='false'
|
||||
@ -20,5 +22,15 @@ uci -q batch <<-EOF >/dev/null
|
||||
add_list dockerd.dockerman.ac_allowed_interface='br-lan'
|
||||
|
||||
commit dockerd
|
||||
EOF
|
||||
EOF
|
||||
# remove dockerd firewall
|
||||
config_load dockerd
|
||||
remove_firewall(){
|
||||
cfg=${1}
|
||||
uci_remove dockerd ${1}
|
||||
}
|
||||
config_foreach remove_firewall firewall
|
||||
# Convert ac_allowed_container to ac_allowed_ports
|
||||
(sleep 30s && /etc/init.d/dockerman convert;/etc/init.d/dockerman restart) &
|
||||
|
||||
exit 0
|
||||
|
@ -1,33 +0,0 @@
|
||||
#!/usr/bin/env lua
|
||||
|
||||
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
|
||||
|
||||
allowed_container = uci:get("dockerd", "dockerman", "ac_allowed_container")
|
||||
if not allowed_container or next(allowed_container)==nil then
|
||||
return
|
||||
end
|
||||
-- for i,v in ipairs(allowed_container) do
|
||||
-- print(v)
|
||||
-- end
|
||||
containers_list = dk.containers:list({
|
||||
query={
|
||||
filters={
|
||||
id=allowed_container
|
||||
}
|
||||
}
|
||||
}).body
|
||||
|
||||
-- allowed_ip = {}
|
||||
for i, v in ipairs(containers_list) do
|
||||
if v.NetworkSettings and v.NetworkSettings.Networks and v.NetworkSettings.Networks.bridge and v.NetworkSettings.Networks.bridge.IPAddress 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 ACCEPT")
|
||||
end
|
||||
end
|
@ -24,7 +24,6 @@ LUCI_PKGARCH:=all
|
||||
LUCI_DEPENDS:=+coreutils +coreutils-base64 +dns2socks +dnsmasq-full +ipset \
|
||||
+ip-full +iptables-mod-tproxy +lua +libuci-lua +microsocks +pdnsd-alt \
|
||||
+tcping +resolveip +shadowsocksr-libev-ssr-check +uclient-fetch \
|
||||
+libustream-openssl \
|
||||
+PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun:kcptun-client \
|
||||
+PACKAGE_$(PKG_NAME)_INCLUDE_NaiveProxy:naiveproxy \
|
||||
+PACKAGE_$(PKG_NAME)_INCLUDE_Redsocks2:redsocks2 \
|
||||
@ -44,6 +43,26 @@ LUCI_DEPENDS:=+coreutils +coreutils-base64 +dns2socks +dnsmasq-full +ipset \
|
||||
+PACKAGE_$(PKG_NAME)_INCLUDE_Xray:xray-core
|
||||
|
||||
define Package/$(PKG_NAME)/config
|
||||
menu "Include libustream-ssl"
|
||||
depends on PACKAGE_$(PKG_NAME)
|
||||
config PACKAGE_$(PKG_NAME)_INCLUDE_libustream-wolfssl
|
||||
bool "Include libustream-wolfssl"
|
||||
default y if DEFAULT_libustream-wolfssl
|
||||
select PACKAGE_libustream-wolfssl
|
||||
|
||||
config PACKAGE_$(PKG_NAME)_INCLUDE_libustream-openssl
|
||||
depends on !PACKAGE_$(PKG_NAME)_INCLUDE_libustream-wolfssl
|
||||
bool "Include libustream-openssl"
|
||||
default y if DEFAULT_libustream-openssl
|
||||
select PACKAGE_libustream-openssl
|
||||
|
||||
config PACKAGE_$(PKG_NAME)_INCLUDE_libustream-mbedtls
|
||||
depends Include !(PACKAGE_$(PKG_NAME)_INCLUDE_libustream-wolfssl || PACKAGE_$(PKG_NAME)_INCLUDE_libustream-openssl)
|
||||
bool "Use libustream-mbedtls"
|
||||
default y if DEFAULT_libustream-mbedtls
|
||||
select PACKAGE_libustream-mbedtls
|
||||
|
||||
endmenu
|
||||
config PACKAGE_$(PKG_NAME)_INCLUDE_Kcptun
|
||||
bool "Include Kcptun"
|
||||
default n
|
||||
|
@ -33,6 +33,10 @@ o = s:option(Value, "filter_words", translate("Subscribe Filter Words"))
|
||||
o.rmempty = true
|
||||
o.description = translate("Filter Words splited by /")
|
||||
|
||||
o = s:option(Value, "save_words", translate("Subscribe Save Words"))
|
||||
o.rmempty = true
|
||||
o.description = translate("Save Words splited by /")
|
||||
|
||||
o = s:option(Button, "update_Sub", translate("Update Subscribe List"))
|
||||
o.inputstyle = "reload"
|
||||
o.description = translate("Update subscribe url list first")
|
||||
|
@ -445,9 +445,15 @@ msgstr "SS/SSR/V2/TROJAN订阅URL"
|
||||
msgid "Subscribe Filter Words"
|
||||
msgstr "订阅节点关键字过滤"
|
||||
|
||||
msgid "Subscribe Save Words"
|
||||
msgstr "订阅节点关键字保留检查"
|
||||
|
||||
msgid "Filter Words splited by /"
|
||||
msgstr "命中关键字的节点将被丢弃。多个关键字用 / 分隔"
|
||||
|
||||
msgid "Save Words splited by /"
|
||||
msgstr "命中关键字的节点将被保留。多个关键字用 / 分隔。此项为空则不启用保留匹配"
|
||||
|
||||
msgid "Update"
|
||||
msgstr "更新"
|
||||
|
||||
|
@ -906,6 +906,7 @@ reset() {
|
||||
set shadowsocksr.@server_subscribe[0].auto_update_time='2'
|
||||
set shadowsocksr.@server_subscribe[0].auto_update='1'
|
||||
set shadowsocksr.@server_subscribe[0].filter_words='过期时间/剩余流量/QQ群/官网/防失联地址/回国'
|
||||
set shadowsocksr.@server_subscribe[0].save_words=''
|
||||
add shadowsocksr access_control
|
||||
set shadowsocksr.@access_control[0].lan_ac_mode='0'
|
||||
set shadowsocksr.@access_control[0].router_proxy='1'
|
||||
|
@ -24,6 +24,7 @@ local proxy = ucic:get_first(name, 'server_subscribe', 'proxy', '0')
|
||||
local switch = ucic:get_first(name, 'server_subscribe', 'switch', '1')
|
||||
local subscribe_url = ucic:get_first(name, 'server_subscribe', 'subscribe_url', {})
|
||||
local filter_words = ucic:get_first(name, 'server_subscribe', 'filter_words', '过期时间/剩余流量')
|
||||
local save_words = ucic:get_first(name, 'server_subscribe', 'save_words', '')
|
||||
local v2_ss = luci.sys.exec('type -t -p ss-redir sslocal') ~= "" and "ss" or "v2ray"
|
||||
local v2_tj = luci.sys.exec('type -t -p trojan') ~= "" and "trojan" or "v2ray"
|
||||
local log = function(...)
|
||||
@ -427,13 +428,43 @@ end
|
||||
|
||||
local function check_filer(result)
|
||||
do
|
||||
-- 过滤的关键词列表
|
||||
local filter_word = split(filter_words, "/")
|
||||
-- 保留的关键词列表
|
||||
local check_save = false
|
||||
if save_words ~= nil and save_words ~= "" and save_words ~= "NULL" then
|
||||
check_save = true
|
||||
end
|
||||
local save_word = split(save_words, "/")
|
||||
|
||||
-- 检查结果
|
||||
local filter_result = false
|
||||
local save_result = true
|
||||
|
||||
-- 检查是否存在过滤关键词
|
||||
for i, v in pairs(filter_word) do
|
||||
if result.alias:find(v) then
|
||||
-- log('订阅节点关键字过滤:“' .. v ..'” ,该节点被丢弃')
|
||||
return true
|
||||
filter_result = true
|
||||
end
|
||||
end
|
||||
|
||||
-- 检查是否打开了保留关键词检查,并且进行过滤
|
||||
if check_save == true then
|
||||
for i, v in pairs(save_word) do
|
||||
if result.alias:find(v) then
|
||||
save_result = false
|
||||
end
|
||||
end
|
||||
else
|
||||
save_result = false
|
||||
end
|
||||
|
||||
-- 不等时返回
|
||||
if filter_result == true or save_result == true then
|
||||
return true
|
||||
else
|
||||
return false
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user