InTheForest/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-01-11 18:51:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Daemon.setSecurityOptions: remove redundant param

Browse Source 
Signed-off-by: Rob Murray <rob.murray@docker.com>
This commit is contained in:
Rob Murray
2025-11-14 12:14:34 +00:00
parent 34925e5be9
commit 33032b0454
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
daemon/container.go
View File

@@ -205,10 +205,10 @@ func (daemon *Daemon) GetDependentContainers(c *container.Container) []*containe
return append(dependentContainers, slices.Collect(maps.Values(daemon.linkIndex.children(c)))...)
}
func (daemon *Daemon) setSecurityOptions(cfg *config.Config, container *container.Container, hostConfig *containertypes.HostConfig) error {
func (daemon *Daemon) setSecurityOptions(cfg *config.Config, container *container.Container) error {
container.Lock()
defer container.Unlock()
return daemon.parseSecurityOpt(cfg, &container.SecurityOptions, hostConfig)
return daemon.parseSecurityOpt(cfg, &container.SecurityOptions, container.HostConfig)
}
// verifyContainerSettings performs validation of the hostconfig and config

2
daemon/create.go
View File

@@ -221,7 +221,7 @@ func (daemon *Daemon) create(ctx context.Context, daemonCfg *config.Config, opts
}
}()
if err := daemon.setSecurityOptions(daemonCfg, ctr, opts.params.HostConfig); err != nil {
if err := daemon.setSecurityOptions(daemonCfg, ctr); err != nil {
return nil, err
}