|
@@ -156,7 +156,17 @@ func (daemon *Daemon) create(params types.ContainerCreateConfig, managed bool) (
|
|
|
return container, nil
|
|
|
}
|
|
|
|
|
|
-func (daemon *Daemon) generateSecurityOpt(ipcMode containertypes.IpcMode, pidMode containertypes.PidMode, privileged bool) ([]string, error) {
|
|
|
+func (daemon *Daemon) generateSecurityOpt(hostConfig *containertypes.HostConfig) ([]string, error) {
|
|
|
+ for _, opt := range hostConfig.SecurityOpt {
|
|
|
+ con := strings.Split(opt, "=")
|
|
|
+ if con[0] == "label" {
|
|
|
+ // Caller overrode SecurityOpts
|
|
|
+ return nil, nil
|
|
|
+ }
|
|
|
+ }
|
|
|
+ ipcMode := hostConfig.IpcMode
|
|
|
+ pidMode := hostConfig.PidMode
|
|
|
+ privileged := hostConfig.Privileged
|
|
|
if ipcMode.IsHost() || pidMode.IsHost() || privileged {
|
|
|
return label.DisableSecOpt(), nil
|
|
|
}
|