toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update vendoring of docker/docker

Browse Source 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 44ac80881f
Component: cli
This commit is contained in:
Vincent Demeester
2017-06-06 00:23:21 +02:00
parent 2764166c95
commit a920b458df
51 changed files with 492 additions and 1207 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
components/cli/cli/command/network/create.go
View File

@ -10,7 +10,6 @@ import (
"github.com/docker/cli/opts"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/network"
runconfigopts "github.com/docker/docker/runconfig/opts"
"github.com/pkg/errors"
"github.com/spf13/cobra"
"golang.org/x/net/context"
@ -107,7 +106,7 @@ func runCreate(dockerCli *command.DockerCli, options createOptions) error {
Ingress: options.ingress,
Scope: options.scope,
ConfigOnly: options.configOnly,
Labels: runconfigopts.ConvertKVStringsToMap(options.labels.GetAll()),
Labels: opts.ConvertKVStringsToMap(options.labels.GetAll()),
}
if from := options.configFrom; from != "" {