瀏覽代碼

Merge pull request #18393 from qzio/apparmor/ptrace-ubuntu14

Enable ptrace in a container on apparmor below 2.9
Jess Frazelle 9 年之前
父節點
當前提交
c38aa60180
共有 1 個文件被更改,包括 4 次插入3 次删除
  1. 4 3
      daemon/execdriver/native/apparmor.go

+ 4 - 3
daemon/execdriver/native/apparmor.go

@@ -60,12 +60,13 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
   deny /sys/firmware/efi/efivars/** rwklx,
   deny /sys/kernel/security/** rwklx,
 
+{{if ge .MajorVersion 2}}{{if ge .MinorVersion 8}}
+  # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container
+  ptrace (trace,read) peer=docker-default,
+{{end}}{{end}}
 {{if ge .MajorVersion 2}}{{if ge .MinorVersion 9}}
   # docker daemon confinement requires explict allow rule for signal
   signal (receive) set=(kill,term) peer={{.ExecPath}},
-
-  # suppress ptrace denails when using 'docker ps'
-  ptrace (trace,read) peer=docker-default,
 {{end}}{{end}}
 }
 `