beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

daemon: fix capitalization of some functions

Browse source 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-08-09 12:33:15 +02:00
parent eeef12f469
commit 5d040cbd16
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
8 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
daemon/apparmor_default.go
View file

@ -12,14 +12,14 @@ import (
// Define constants for native driver // Define constants for native driver
const ( const (
unconfinedAppArmorProfile = "unconfined" unconfinedAppArmorProfile = "unconfined"
defaultApparmorProfile = "docker-default" defaultAppArmorProfile = "docker-default"
) )
func ensureDefaultAppArmorProfile() error { func ensureDefaultAppArmorProfile() error {
if apparmor.IsEnabled() { if apparmor.IsEnabled() {
loaded, err := aaprofile.IsLoaded(defaultApparmorProfile) loaded, err := aaprofile.IsLoaded(defaultAppArmorProfile)
if err != nil { if err != nil {
return fmt.Errorf("Could not check if %s AppArmor profile was loaded: %s", defaultApparmorProfile, err) return fmt.Errorf("Could not check if %s AppArmor profile was loaded: %s", defaultAppArmorProfile, err)
} }
// Nothing to do. // Nothing to do.
@ -28,8 +28,8 @@ func ensureDefaultAppArmorProfile() error {
} }
// Load the profile. // Load the profile.
if err := aaprofile.InstallDefault(defaultApparmorProfile); err != nil { if err := aaprofile.InstallDefault(defaultAppArmorProfile); err != nil {
return fmt.Errorf("AppArmor enabled on system but the %s profile could not be loaded: %s", defaultApparmorProfile, err) return fmt.Errorf("AppArmor enabled on system but the %s profile could not be loaded: %s", defaultAppArmorProfile, err)
} }
} }

4
daemon/container_linux.go
View file

@ -7,7 +7,7 @@ import (
"github.com/docker/docker/errdefs" "github.com/docker/docker/errdefs"
) )
func (daemon *Daemon) saveApparmorConfig(container *container.Container) error { func (daemon *Daemon) saveAppArmorConfig(container *container.Container) error {
container.AppArmorProfile = "" // we don't care about the previous value. container.AppArmorProfile = "" // we don't care about the previous value.
if !daemon.apparmorEnabled { if !daemon.apparmorEnabled {
@ -20,7 +20,7 @@ func (daemon *Daemon) saveApparmorConfig(container *container.Container) error {
if !container.HostConfig.Privileged { if !container.HostConfig.Privileged {
if container.AppArmorProfile == "" { if container.AppArmorProfile == "" {
container.AppArmorProfile = defaultApparmorProfile container.AppArmorProfile = defaultAppArmorProfile
} }
} else { } else {

2
daemon/container_windows.go
View file

@ -4,6 +4,6 @@ import (
"github.com/docker/docker/container" "github.com/docker/docker/container"
) )
func (daemon *Daemon) saveApparmorConfig(container *container.Container) error { func (daemon *Daemon) saveAppArmorConfig(container *container.Container) error {
return nil return nil
} }

2
daemon/daemon_linux.go
View file

@ -127,7 +127,7 @@ func shouldUnmountRoot(root string, info *mountinfo.Info) bool {
if !strings.HasSuffix(root, info.Root) { if !strings.HasSuffix(root, info.Root) {
return false return false
} }
return hasMountinfoOption(info.Optional, sharedPropagationOption) return hasMountInfoOption(info.Optional, sharedPropagationOption)
} }
// setupResolvConf sets the appropriate resolv.conf file if not specified // setupResolvConf sets the appropriate resolv.conf file if not specified

2
daemon/daemon_unix.go
View file

@ -1326,7 +1326,7 @@ func setupDaemonRootPropagation(cfg *config.Config) error {
} }
}() }()
if hasMountinfoOption(options, sharedPropagationOption, slavePropagationOption) { if hasMountInfoOption(options, sharedPropagationOption, slavePropagationOption) {
cleanupOldFile = true cleanupOldFile = true
return nil return nil
} }

4
daemon/exec_linux.go
View file

@ -40,10 +40,10 @@ func (daemon *Daemon) execSetPlatformOpt(c *container.Container, ec *exec.Config
// profiles. Privileged configuration of the container is inherited // profiles. Privileged configuration of the container is inherited
appArmorProfile = unconfinedAppArmorProfile appArmorProfile = unconfinedAppArmorProfile
} else { } else {
appArmorProfile = defaultApparmorProfile appArmorProfile = defaultAppArmorProfile
} }
if appArmorProfile == defaultApparmorProfile { if appArmorProfile == defaultAppArmorProfile {
// Unattended upgrades and other fun services can unload AppArmor // Unattended upgrades and other fun services can unload AppArmor
// profiles inadvertently. Since we cannot store our profile in // profiles inadvertently. Since we cannot store our profile in
// /etc/apparmor.d, nor can we practically add other ways of // /etc/apparmor.d, nor can we practically add other ways of

12
daemon/oci_linux.go
View file

@ -135,10 +135,10 @@ func WithApparmor(c *container.Container) coci.SpecOpts {
} else if c.HostConfig.Privileged { } else if c.HostConfig.Privileged {
appArmorProfile = unconfinedAppArmorProfile appArmorProfile = unconfinedAppArmorProfile
} else { } else {
appArmorProfile = defaultApparmorProfile appArmorProfile = defaultAppArmorProfile
} }
if appArmorProfile == defaultApparmorProfile { if appArmorProfile == defaultAppArmorProfile {
// Unattended upgrades and other fun services can unload AppArmor // Unattended upgrades and other fun services can unload AppArmor
// profiles inadvertently. Since we cannot store our profile in // profiles inadvertently. Since we cannot store our profile in
// /etc/apparmor.d, nor can we practically add other ways of // /etc/apparmor.d, nor can we practically add other ways of
@ -397,9 +397,9 @@ const (
slavePropagationOption = "master:" slavePropagationOption = "master:"
) )
// hasMountinfoOption checks if any of the passed any of the given option values // hasMountInfoOption checks if any of the passed any of the given option values
// are set in the passed in option string. // are set in the passed in option string.
func hasMountinfoOption(opts string, vals ...string) bool { func hasMountInfoOption(opts string, vals ...string) bool {
for _, opt := range strings.Split(opts, " ") { for _, opt := range strings.Split(opts, " ") {
for _, val := range vals { for _, val := range vals {
if strings.HasPrefix(opt, val) { if strings.HasPrefix(opt, val) {
@ -417,7 +417,7 @@ func ensureShared(path string) error {
return err return err
} }
// Make sure source mount point is shared. // Make sure source mount point is shared.
if !hasMountinfoOption(optionalOpts, sharedPropagationOption) { if !hasMountInfoOption(optionalOpts, sharedPropagationOption) {
return errors.Errorf("path %s is mounted on %s but it is not a shared mount", path, sourceMount) return errors.Errorf("path %s is mounted on %s but it is not a shared mount", path, sourceMount)
} }
return nil return nil
@ -430,7 +430,7 @@ func ensureSharedOrSlave(path string) error {
return err return err
} }
if !hasMountinfoOption(optionalOpts, sharedPropagationOption, slavePropagationOption) { if !hasMountInfoOption(optionalOpts, sharedPropagationOption, slavePropagationOption) {
return errors.Errorf("path %s is mounted on %s but it is not a shared or slave mount", path, sourceMount) return errors.Errorf("path %s is mounted on %s but it is not a shared or slave mount", path, sourceMount)
} }
return nil return nil

2
daemon/start.go
View file

@ -164,7 +164,7 @@ func (daemon *Daemon) containerStart(container *container.Container, checkpoint
container.HasBeenManuallyStopped = false container.HasBeenManuallyStopped = false
} }
if err := daemon.saveApparmorConfig(container); err != nil { if err := daemon.saveAppArmorConfig(container); err != nil {
return err return err
} }