Browse Source

profiles: apparmor: remove unused fields

ExecPath isn't used by anything, and the signal apparmor rule isn't used
because it refers to a peer that we don't ship.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
Aleksa Sarai 9 years ago
parent
commit
64fb664908
2 changed files with 0 additions and 6 deletions
  1. 0 2
      profiles/apparmor/apparmor.go
  2. 0 4
      profiles/apparmor/template.go

+ 0 - 2
profiles/apparmor/apparmor.go

@@ -24,8 +24,6 @@ var (
 type profileData struct {
 type profileData struct {
 	// Name is profile name.
 	// Name is profile name.
 	Name string
 	Name string
-	// ExecPath is the path to the docker binary.
-	ExecPath string
 	// Imports defines the apparmor functions to import, before defining the profile.
 	// Imports defines the apparmor functions to import, before defining the profile.
 	Imports []string
 	Imports []string
 	// InnerImports defines the apparmor functions to import in the profile.
 	// InnerImports defines the apparmor functions to import in the profile.

+ 0 - 4
profiles/apparmor/template.go

@@ -42,9 +42,5 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
   # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container
   # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container
   ptrace (trace,read) peer=docker-default,
   ptrace (trace,read) peer=docker-default,
 {{end}}
 {{end}}
-{{if ge .Version 209000}}
-  # docker daemon confinement requires explict allow rule for signal
-  signal (receive) set=(kill,term) peer={{.ExecPath}},
-{{end}}
 }
 }
 `
 `