github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #1294 from jterry75/fix_windows_hostname_upstream

Browse Source 
Forward SandboxConfig.Hostname to Workload container activation
This commit is contained in:
Lantao Liu 2019-09-24 11:40:51 -07:00 committed by GitHub
commit 44e1f8ded5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkg/server/container_create_windows.go
View File

@ -63,6 +63,7 @@ func (c *criService) containerSpec(id string, sandboxID string, sandboxPid uint3
// NOTE: readonly rootfs doesn't work on windows. // NOTE: readonly rootfs doesn't work on windows.
customopts.WithoutRoot, customopts.WithoutRoot,
customopts.WithWindowsNetworkNamespace(netNSPath), customopts.WithWindowsNetworkNamespace(netNSPath),
oci.WithHostname(sandboxConfig.GetHostname()),
) )
specOpts = append(specOpts, customopts.WithWindowsMounts(c.os, config, extraMounts)) specOpts = append(specOpts, customopts.WithWindowsMounts(c.os, config, extraMounts))