Merge pull request #3 from arush-sal/master

Fix multiple-value in single-value context error
This commit is contained in:
Jess Frazelle 2017-06-19 11:00:15 -04:00 committed by GitHub
commit 7fabab0363

View file

@ -183,7 +183,7 @@ func main() {
// install the default apparmor profile // install the default apparmor profile
if apparmor.IsEnabled() { if apparmor.IsEnabled() {
// check if we have the docker-default apparmor profile loaded // check if we have the docker-default apparmor profile loaded
if err := aaprofile.IsLoaded(defaultApparmorProfile); err != nil { if _, err := aaprofile.IsLoaded(defaultApparmorProfile); err != nil {
logrus.Warnf("AppArmor enabled on system but the %s profile is not loaded. apparmor_parser needs root to load a profile so we can't do it for you.", defaultApparmorProfile) logrus.Warnf("AppArmor enabled on system but the %s profile is not loaded. apparmor_parser needs root to load a profile so we can't do it for you.", defaultApparmorProfile)
} else { } else {
spec.Process.ApparmorProfile = defaultApparmorProfile spec.Process.ApparmorProfile = defaultApparmorProfile