瀏覽代碼

Merge pull request #14855 from ewindisch/apparmor-unconfined

Introduce a dedicated unconfined AA policy
David Calavera 10 年之前
父節點
當前提交
ac9fc03c74
共有 2 個文件被更改,包括 13 次插入1 次删除
  1. 12 0
      contrib/apparmor/docker
  2. 1 1
      daemon/execdriver/native/create.go

+ 12 - 0
contrib/apparmor/docker

@@ -23,3 +23,15 @@ profile docker-default flags=(attach_disconnected,mediate_deleted) {
   deny /sys/firmware/efi/efivars/** rwklx,
   deny /sys/kernel/security/** rwklx,
 }
+
+profile docker-unconfined flags=(attach_disconnected,mediate_deleted) {
+  #include <abstractions/base>
+
+  network,
+  capability,
+  file,
+  umount,
+  mount,
+  pivot_root,
+  change_profile -> *,
+}

+ 1 - 1
daemon/execdriver/native/create.go

@@ -198,7 +198,7 @@ func (d *driver) setPrivileged(container *configs.Config) (err error) {
 	container.Devices = hostDevices
 
 	if apparmor.IsEnabled() {
-		container.AppArmorProfile = "unconfined"
+		container.AppArmorProfile = "docker-unconfined"
 	}
 
 	return nil