mirrors/k3d
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #322 from kshelton/main

Browse Source 
Handle leading '/' in names for docker runtime (thanks @kshelton)
This commit is contained in:
Thorsten Klein 2020-08-12 14:42:36 +03:00 committed by GitHub
commit 7b07b8b6dc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
pkg/runtimes/docker/container.go
View File

@ -147,7 +147,8 @@ func getNodeContainer(ctx context.Context, node *k3d.Node) (*types.Container, er
for k, v := range node.Labels { for k, v := range node.Labels {
filters.Add("label", fmt.Sprintf("%s=%s", k, v)) filters.Add("label", fmt.Sprintf("%s=%s", k, v))
} }
filters.Add("name", fmt.Sprintf("^%s$", node.Name)) // regex filtering for exact name match // See https://github.com/moby/moby/issues/29997 for explanation around initial /
filters.Add("name", fmt.Sprintf("^/?%s$", node.Name)) // regex filtering for exact name match
containers, err := docker.ContainerList(ctx, types.ContainerListOptions{ containers, err := docker.ContainerList(ctx, types.ContainerListOptions{
Filters: filters, Filters: filters,