docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add back golint for daemon/execdriver/native 

It's broken by #15099 Fix it.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
This commit is contained in:
Qiang Huang 2015-07-30 08:58:54 +08:00
parent 4c7cf30260
commit e34f562a77
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/execdriver/native/driver.go
View File

@ -58,11 +58,11 @@ func NewDriver(root, initPath string, options []string) (*Driver, error) {
if apparmor.IsEnabled() { if apparmor.IsEnabled() {
if err := installAppArmorProfile(); err != nil { if err := installAppArmorProfile(); err != nil {
apparmor_profiles := []string{"docker-default", "docker-unconfined"} apparmorProfiles := []string{"docker-default", "docker-unconfined"}
// Allow daemon to run if loading failed, but are active // Allow daemon to run if loading failed, but are active
// (possibly through another run, manually, or via system startup) // (possibly through another run, manually, or via system startup)
for _, policy := range apparmor_profiles { for _, policy := range apparmorProfiles {
if err := hasAppArmorProfileLoaded(policy); err != nil { if err := hasAppArmorProfileLoaded(policy); err != nil {
return nil, fmt.Errorf("AppArmor enabled on system but the %s profile could not be loaded.", policy) return nil, fmt.Errorf("AppArmor enabled on system but the %s profile could not be loaded.", policy)
} }

1
hack/make/validate-lint
View File

@ -19,6 +19,7 @@ packages=(
daemon/execdriver daemon/execdriver
daemon/execdriver/execdrivers daemon/execdriver/execdrivers
daemon/execdriver/lxc daemon/execdriver/lxc
daemon/execdriver/native
daemon/execdriver/native/template daemon/execdriver/native/template
daemon/graphdriver/aufs daemon/graphdriver/aufs
daemon/graphdriver/devmapper daemon/graphdriver/devmapper