From 818d0dc5fda4866032ff020ad1514a147d718bf9 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 11 Feb 2019 22:04:31 +0100 Subject: [PATCH] builder: alias containerd errdefs to prevent confusion the containerd errdefs functions have the same name as the docker errdefs, but their types use a different signature; use an alias to prevent them from being mistaken for the docker errdefs equivalents. Signed-off-by: Sebastiaan van Stijn --- builder/builder-next/adapters/containerimage/pull.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/builder/builder-next/adapters/containerimage/pull.go b/builder/builder-next/adapters/containerimage/pull.go index b1e44d95e9..e2dd37af28 100644 --- a/builder/builder-next/adapters/containerimage/pull.go +++ b/builder/builder-next/adapters/containerimage/pull.go @@ -11,7 +11,7 @@ import ( "time" "github.com/containerd/containerd/content" - "github.com/containerd/containerd/errdefs" + containerderrors "github.com/containerd/containerd/errdefs" "github.com/containerd/containerd/images" "github.com/containerd/containerd/platforms" ctdreference "github.com/containerd/containerd/reference" @@ -36,7 +36,7 @@ import ( "github.com/moby/buildkit/util/progress" "github.com/moby/buildkit/util/resolver" "github.com/moby/buildkit/util/tracing" - digest "github.com/opencontainers/go-digest" + "github.com/opencontainers/go-digest" "github.com/opencontainers/image-spec/identity" ocispec "github.com/opencontainers/image-spec/specs-go/v1" "github.com/pkg/errors" @@ -654,7 +654,7 @@ func showProgress(ctx context.Context, ongoing *jobs, cs content.Store, pw progr if !j.done { info, err := cs.Info(context.TODO(), j.Digest) if err != nil { - if errdefs.IsNotFound(err) { + if containerderrors.IsNotFound(err) { // pw.Write(j.Digest.String(), progress.Status{ // Action: "waiting", // })