norohind/dive-zfs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Using the same client.WithVersion(dockerVersion) as in other places. On my machine ImageInspectWithRaw was failing for an API mismatch and it was always trying to pull (#104)

Browse Source
This commit is contained in:
Chris Cinelli 2018-11-29 14:22:03 -08:00 committed by Alex Goodman
parent 8e6709a93a
commit 0904611df7
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
image/image.go
View File

@ -202,7 +202,7 @@ func InitializeData(imageID string) ([]*Layer, []*filetree.FileTree, float64, fi
// pull the image if it does not exist // pull the image if it does not exist
ctx := context.Background() ctx := context.Background()
dockerClient, err := client.NewClientWithOpts(client.FromEnv) dockerClient, err := client.NewClientWithOpts(client.WithVersion(dockerVersion), client.FromEnv)
if err != nil { if err != nil {
fmt.Println("Could not connect to the Docker daemon:" + err.Error()) fmt.Println("Could not connect to the Docker daemon:" + err.Error())
utils.Exit(1) utils.Exit(1)
@ -210,6 +210,7 @@ func InitializeData(imageID string) ([]*Layer, []*filetree.FileTree, float64, fi
_, _, err = dockerClient.ImageInspectWithRaw(ctx, imageID) _, _, err = dockerClient.ImageInspectWithRaw(ctx, imageID)
if err != nil { if err != nil {
// don't use the API, the CLI has more informative output // don't use the API, the CLI has more informative output
fmt.Println("Image not available locally... Trying to pull '" + imageID + "'")
utils.RunDockerCmd("pull", imageID) utils.RunDockerCmd("pull", imageID)
} }