Преглед на файлове

fix apparmor load profile

Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>
(cherry picked from commit 2ab8f2e389b4ae90d0cec6555ea5708ceca1cc3c)
Signed-off-by: Victor Vieux <vieux@docker.com>
Xianglin Gao преди 8 години
родител
ревизия
be7d576f5d
променени са 2 файла, в които са добавени 2 реда и са изтрити 3 реда
  1. 1 2
      pkg/aaparser/aaparser.go
  2. 1 1
      profiles/apparmor/template.go

+ 1 - 2
pkg/aaparser/aaparser.go

@@ -4,7 +4,6 @@ package aaparser
 import (
 	"fmt"
 	"os/exec"
-	"path/filepath"
 	"strconv"
 	"strings"
 )
@@ -26,7 +25,7 @@ func GetVersion() (int, error) {
 // LoadProfile runs `apparmor_parser -r` on a specified apparmor profile to
 // replace the profile.
 func LoadProfile(profilePath string) error {
-	_, err := cmd("", "-r", filepath.Dir(profilePath))
+	_, err := cmd("", "-r", profilePath)
 	if err != nil {
 		return err
 	}

+ 1 - 1
profiles/apparmor/template.go

@@ -40,7 +40,7 @@ profile {{.Name}} flags=(attach_disconnected,mediate_deleted) {
 
 {{if ge .Version 208095}}
   # suppress ptrace denials when using 'docker ps' or using 'ps' inside a container
-  ptrace (trace,read) peer=docker-default,
+  ptrace (trace,read) peer={{.Name}},
 {{end}}
 }
 `