Skip to content

Commit 2389d45

Browse files
authored
Merge pull request #2988 from crazy-max/ctn-driver-display-pull-error
docker-container: check error from response body when pulling image
2 parents 1dc5f07 + 3f82aad commit 2389d45

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

driver/docker-container/driver.go

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ import (
2626
"github.com/docker/docker/errdefs"
2727
dockerarchive "github.com/docker/docker/pkg/archive"
2828
"github.com/docker/docker/pkg/idtools"
29+
"github.com/docker/docker/pkg/jsonmessage"
2930
"github.com/docker/docker/pkg/stdcopy"
3031
"github.com/moby/buildkit/client"
3132
"github.com/pkg/errors"
@@ -94,14 +95,14 @@ func (d *Driver) create(ctx context.Context, l progress.SubLogger) error {
9495
if err != nil {
9596
return err
9697
}
97-
rc, err := d.DockerAPI.ImageCreate(ctx, imageName, image.CreateOptions{
98+
resp, err := d.DockerAPI.ImageCreate(ctx, imageName, image.CreateOptions{
9899
RegistryAuth: ra,
99100
})
100101
if err != nil {
101102
return err
102103
}
103-
_, err = io.Copy(io.Discard, rc)
104-
return err
104+
defer resp.Close()
105+
return jsonmessage.DisplayJSONMessagesStream(resp, io.Discard, 0, false, nil)
105106
}); err != nil {
106107
// image pulling failed, check if it exists in local image store.
107108
// if not, return pulling error. otherwise log it.

0 commit comments

Comments
 (0)