opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-12-14 19:10:16 +08:00
Code Issues Packages Projects Releases Wiki Activity

vendor: update github.com/containernetworking/cni to v0.7.2-0.20200304161608-4fae32b84921

Browse Source 
Specifically to get:

https://github.com/containernetworking/cni/pull/735
6f29b0165883b2b52ccd4dcb937162ea4c86927b intercept netplugin std err

But also pulls in some interface name validation and a compatibility
fix for configurations that don't set a CNI version.

Signed-off-by: Dan Williams <dcbw@redhat.com>
This commit is contained in:
Dan Williams
2020-03-06 09:58:37 -06:00
parent f07e18f05c
commit 74ddc0b696
11 changed files with 56 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/github.com/containernetworking/cni/pkg/invoke/args.go generated vendored
View File

@@ -60,8 +60,8 @@ func (args *Args) AsEnv() []string {
pluginArgsStr = stringify(args.PluginArgs)
}
// Duplicated values which come first will be overrided, so we must put the
// custom values in the end to avoid being overrided by the process environments.
// Duplicated values which come first will be overridden, so we must put the
// custom values in the end to avoid being overridden by the process environments.
env = append(env,
"CNI_COMMAND="+args.Command,
"CNI_CONTAINERID="+args.ContainerID,