docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-23 15:21:32 +03:00
Code Activity

Merge pull request #27051 from tophj-ibm/fix-installing-apparmor

Browse Source 
Fix apparmor profile installation
Upstream-commit: 50856a2ce29a8cd4ecd22a3ba8f6274c2ba6977c
Component: engine
This commit is contained in:
Justin Cormack
2016-09-30 17:38:20 +01:00
committed by GitHub
parent fc5500f19e c15d8c9103
commit dc025b4907
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/pkg/aaparser/aaparser.go
View File

@@ -26,7 +26,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", filepath.Dir(profilePath))
if err != nil {
return err
}

4
components/engine/profiles/apparmor/apparmor.go
View File

@@ -66,8 +66,8 @@ func macroExists(m string) bool {
return err == nil
}
// InstallDefault generates a default profile and installs it in the
// ProfileDirectory with `apparmor_parser`.
// InstallDefault generates a default profile in a temp directory determined by
// os.TempDir(), then loads the profile into the kernel using 'apparmor_parser'.
func InstallDefault(name string) error {
p := profileData{
Name: name,