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

Merge pull request #50601 from thaJeztah/cleanup_buildSandboxOptions

Browse Source 
daemon: make buildSandboxOptions, buildSandboxPlatformOptions more atomic
This commit is contained in:
Sebastiaan van Stijn
2025-08-05 13:49:10 +02:00
committed by GitHub
parent c6ca504388 15f78b752c
commit 7fa01a73cd
3 changed files with 28 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
daemon/container_operations.go
View File

@@ -61,10 +61,13 @@ func buildSandboxOptions(cfg *config.Config, ctr *container.Container) ([]libnet
sboxOptions = append(sboxOptions, libnetwork.OptionUseExternalKey())
}
// Add platform-specific Sandbox options.
if err := buildSandboxPlatformOptions(ctr, cfg, &sboxOptions); err != nil {
// Update the container with platform-specific options, and
// add platform-specific Sandbox options.
platformOpts, err := buildSandboxPlatformOptions(ctr, cfg)
if err != nil {
return nil, err
}
sboxOptions = append(sboxOptions, platformOpts...)
if len(ctr.HostConfig.DNS) > 0 {
dnsAddrs, err := toNetIP(ctr.HostConfig.DNS)