Skip to content

Commit

Permalink
Issue containers#327 Creating Docker client from env settings
Browse files Browse the repository at this point in the history
Signed-off-by: Hardy Ferentschik <[email protected]>
  • Loading branch information
hferentschik committed Aug 14, 2017
1 parent 74e3593 commit dc427f7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion docker/daemon/daemon_dest.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func newImageDestination(systemCtx *types.SystemContext, ref daemonReference) (t
return nil, errors.Errorf("Invalid destination docker-daemon:%s: a destination must be a name:tag", ref.StringWithinTransport())
}

c, err := client.NewClient(client.DefaultDockerHost, "1.22", nil, nil) // FIXME: overridable host
c, err := client.NewEnvClient()
if err != nil {
return nil, errors.Wrap(err, "Error initializing docker engine client")
}
Expand Down
2 changes: 1 addition & 1 deletion docker/daemon/daemon_src.go
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ type layerInfo struct {
// is the config, and that the following len(RootFS) files are the layers, but that feels
// way too brittle.)
func newImageSource(ctx *types.SystemContext, ref daemonReference) (types.ImageSource, error) {
c, err := client.NewClient(client.DefaultDockerHost, "1.22", nil, nil) // FIXME: overridable host
c, err := client.NewEnvClient()
if err != nil {
return nil, errors.Wrap(err, "Error initializing docker engine client")
}
Expand Down

0 comments on commit dc427f7

Please sign in to comment.