toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #10186 from rhatdan/selinux-build

Browse Source 
Turn on Security opts including labeling for docker build
Upstream-commit: 6efecb7b41d1c80e98131307ae428a2f1f57d1ea
Component: engine
This commit is contained in:
Alexander Morozov
2015-02-06 14:11:21 -08:00
parent dfd79f3c67 d61c0e9f91
commit de53eceaad
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/create.go
+4 -1
View File
@@ -94,7 +94,10 @@ func (daemon *Daemon) Create(config *runconfig.Config, hostConfig *runconfig.Hos
if warnings, err = daemon.mergeAndVerifyConfig(config, img); err != nil {
return nil, nil, err
}
if hostConfig != nil && hostConfig.SecurityOpt == nil {
if hostConfig == nil {
hostConfig = &runconfig.HostConfig{}
}
if hostConfig.SecurityOpt == nil {
hostConfig.SecurityOpt, err = daemon.GenerateSecurityOpt(hostConfig.IpcMode, hostConfig.PidMode)
if err != nil {
return nil, nil, err