mirror of
https://github.com/rancher/os.git
synced 2025-09-01 14:48:55 +00:00
Bump cniglue
This commit is contained in:
7
vendor/github.com/rancher/cniglue/cni.go
generated
vendored
7
vendor/github.com/rancher/cniglue/cni.go
generated
vendored
@@ -61,7 +61,12 @@ func NewCNIExec(state *DockerPluginState) (*CNIExec, error) {
|
||||
},
|
||||
}
|
||||
|
||||
dir := fmt.Sprintf(cniDir, state.HostConfig.NetworkMode.NetworkName())
|
||||
network := state.HostConfig.NetworkMode.NetworkName()
|
||||
if network == "" {
|
||||
network = "default"
|
||||
}
|
||||
|
||||
dir := fmt.Sprintf(cniDir, network)
|
||||
files, err := libcni.ConfFiles(dir)
|
||||
if err != nil {
|
||||
return nil, err
|
||||
|
7
vendor/github.com/rancher/cniglue/trash.conf
generated
vendored
Normal file
7
vendor/github.com/rancher/cniglue/trash.conf
generated
vendored
Normal file
@@ -0,0 +1,7 @@
|
||||
github.com/containernetworking/cni b8e92ed030588120f9fda47dd359e17a3234142d
|
||||
github.com/docker/engine-api f90ecdb1e989f834dabbd91807e891094aa069fe
|
||||
github.com/docker/go-connections 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
|
||||
github.com/docker/go-units f2d77a61e3c169b43402a0a1e84f06daf29b8190
|
||||
github.com/opencontainers/specs b45aa77484bb771fc50498020063abcbc9b5f4c2
|
||||
github.com/pkg/errors d62207b3dc916c342cd6a7180fa861d898cf42ee
|
||||
github.com/Sirupsen/logrus 446d1c146faa8ed3f4218f056fcd165f6bcfda81
|
15
vendor/github.com/rancher/cniglue/trash.yml
generated
vendored
15
vendor/github.com/rancher/cniglue/trash.yml
generated
vendored
@@ -1,15 +0,0 @@
|
||||
import:
|
||||
- package: github.com/pkg/errors
|
||||
version: d62207b3dc916c342cd6a7180fa861d898cf42ee
|
||||
- package: github.com/Sirupsen/logrus
|
||||
version: 446d1c146faa8ed3f4218f056fcd165f6bcfda81
|
||||
- package: github.com/docker/go-connections
|
||||
version: 990a1a1a70b0da4c4cb70e117971a4f0babfbf1a
|
||||
- package: github.com/docker/engine-api
|
||||
version: f90ecdb1e989f834dabbd91807e891094aa069fe
|
||||
- package: github.com/docker/go-units
|
||||
version: f2d77a61e3c169b43402a0a1e84f06daf29b8190
|
||||
- package: github.com/opencontainers/specs
|
||||
version: b45aa77484bb771fc50498020063abcbc9b5f4c2
|
||||
- package: github.com/containernetworking/cni
|
||||
version: b8e92ed030588120f9fda47dd359e17a3234142d
|
Reference in New Issue
Block a user