Skip to content

Improve log output of docker pull errors #880

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
eseliger merged 2 commits into from
Nov 7, 2022
Merged

Improve log output of docker pull errors #880

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8fe5328
Improve log output of docker pull errors
eseliger Nov 5, 2022
7067223
Merge branch 'main' into es/docker-pull-error-logs
eseliger Nov 7, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions internal/batches/docker/image.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ import (
"bytes"
"context"
"fmt"
goexec "os/exec"
"strings"
"sync"

Expand Down Expand Up @@ -87,7 +88,7 @@ func (image *image) Ensure(ctx context.Context) error {
defer cancel()

args := []string{"image", "inspect", "--format", "{{ .Id }}", image.name}
out, err := exec.CommandContext(dctx, "docker", args...).CombinedOutput()
out, err := exec.CommandContext(dctx, "docker", args...).Output()
id := string(bytes.TrimSpace(out))

if errors.IsDeadlineExceeded(err) || errors.IsDeadlineExceeded(dctx.Err()) {
Expand All @@ -108,7 +109,14 @@ func (image *image) Ensure(ctx context.Context) error {
return err
} else if err != nil {
// Let's try pulling the image.
if err := exec.CommandContext(ctx, "docker", "image", "pull", image.name).Run(); err != nil {
pullCmd := exec.CommandContext(ctx, "docker", "image", "pull", image.name)
var stderr bytes.Buffer
pullCmd.Stderr = &stderr
if err := pullCmd.Run(); err != nil {
exitErr := &goexec.ExitError{}
if errors.As(err, &exitErr) {
return errors.Newf("failed to pull image: %s\ndocker pull exited with code %d", stderr.String(), exitErr.ExitCode())
}
return errors.Wrap(err, "pulling image")
}
// And try again to get the image digest.
Expand Down