Browse code
Merge pull request #10186 from rhatdan/selinux-build
Turn on Security opts including labeling for docker build
Alexander Morozov authored on 2015/02/07 07:11:21Showing 1 changed files
| ... | ... |
@@ -94,7 +94,10 @@ func (daemon *Daemon) Create(config *runconfig.Config, hostConfig *runconfig.Hos |
| 94 | 94 |
if warnings, err = daemon.mergeAndVerifyConfig(config, img); err != nil {
|
| 95 | 95 |
return nil, nil, err |
| 96 | 96 |
} |
| 97 |
- if hostConfig != nil && hostConfig.SecurityOpt == nil {
|
|
| 97 |
+ if hostConfig == nil {
|
|
| 98 |
+ hostConfig = &runconfig.HostConfig{}
|
|
| 99 |
+ } |
|
| 100 |
+ if hostConfig.SecurityOpt == nil {
|
|
| 98 | 101 |
hostConfig.SecurityOpt, err = daemon.GenerateSecurityOpt(hostConfig.IpcMode, hostConfig.PidMode) |
| 99 | 102 |
if err != nil {
|
| 100 | 103 |
return nil, nil, err |