diff --git a/luci-app-dockerman/Makefile b/luci-app-dockerman/Makefile index 0c82b1935..ebd0c3482 100644 --- a/luci-app-dockerman/Makefile +++ b/luci-app-dockerman/Makefile @@ -14,7 +14,7 @@ PKG_LICENSE:=AGPL-3.0 PKG_MAINTAINER:=lisaac \ Florian Eckert -PKG_VERSION:=v0.5.25 +PKG_VERSION:=v0.5.26 include $(TOPDIR)/feeds/luci/luci.mk diff --git a/luci-app-dockerman/luasrc/controller/dockerman.lua b/luci-app-dockerman/luasrc/controller/dockerman.lua index 7aeed56e1..c2afabce3 100644 --- a/luci-app-dockerman/luasrc/controller/dockerman.lua +++ b/luci-app-dockerman/luasrc/controller/dockerman.lua @@ -10,7 +10,7 @@ module("luci.controller.dockerman",package.seeall) function index() entry({"admin", "docker"}, - alias("admin", "docker", "config"), + firstchild(), _("Docker"), 40).acl_depends = { "luci-app-dockerman" } diff --git a/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua b/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua index c91f349ce..37a421ac2 100644 --- a/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua +++ b/luci-app-dockerman/luasrc/model/cbi/dockerman/overview.lua @@ -124,8 +124,10 @@ if not lost_state then end docker_info_table['8IndexServerAddress']._value = docker_info.body.IndexServerAddress - for i, v in ipairs(docker_info.body.RegistryConfig.Mirrors) do - docker_info_table['9RegistryMirrors']._value = docker_info_table['9RegistryMirrors']._value == "-" and v or (docker_info_table['9RegistryMirrors']._value .. ", " .. v) + if docker_info.body.RegistryConfig and docker_info.body.RegistryConfig.Mirrors then + for i, v in ipairs(docker_info.body.RegistryConfig.Mirrors) do + docker_info_table['9RegistryMirrors']._value = docker_info_table['9RegistryMirrors']._value == "-" and v or (docker_info_table['9RegistryMirrors']._value .. ", " .. v) + end end s.images_used = 0 diff --git a/luci-app-dockerman/po/zh-cn/dockerman.po b/luci-app-dockerman/po/zh-cn/dockerman.po index 2bdc11b8d..4959bb0d1 100644 --- a/luci-app-dockerman/po/zh-cn/dockerman.po +++ b/luci-app-dockerman/po/zh-cn/dockerman.po @@ -8,7 +8,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0;\n" -"X-Generator: Weblate 4.5.2-dev\n" +"X-Generator: Weblate 4.10-dev\n" #: applications/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua:619 msgid "A list of kernel capabilities to add to the container"