From 8af7a7be937c3f541669ef05e5a57c186ffe26fb Mon Sep 17 00:00:00 2001 From: CN_SZTL Date: Sat, 16 May 2020 18:36:25 +0800 Subject: [PATCH] luci-app-dockerman: sync with upstream source --- package/ctcgfw/luci-app-dockerman/Makefile | 2 +- .../luasrc/model/cbi/dockerman/newcontainer.lua | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/package/ctcgfw/luci-app-dockerman/Makefile b/package/ctcgfw/luci-app-dockerman/Makefile index 77529f2c5c..5cfbdbae26 100644 --- a/package/ctcgfw/luci-app-dockerman/Makefile +++ b/package/ctcgfw/luci-app-dockerman/Makefile @@ -1,7 +1,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=luci-app-dockerman -PKG_VERSION:=v0.5.11 +PKG_VERSION:=v0.5.12 PKG_RELEASE:=beta PKG_MAINTAINER:=lisaac PKG_LICENSE:=AGPL-3.0 diff --git a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua index 2ecdd03ca4..324fc6dd70 100644 --- a/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua +++ b/package/ctcgfw/luci-app-dockerman/luasrc/model/cbi/dockerman/newcontainer.lua @@ -510,6 +510,10 @@ m.handle = function(self, state, data) t['PathOnHost'] = h t['PathInContainer'] = c t['CgroupPermissions'] = "rwm" + else + t['PathOnHost'] = v + t['PathInContainer'] = v + t['CgroupPermissions'] = "rwm" end end if next(t) ~= nil then