kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

builder: alias containerd errdefs to prevent confusion

Browse source 
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 <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2019-02-11 22:04:31 +01:00
parent 0cafc84fb2
commit 818d0dc5fd
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
builder/builder-next/adapters/containerimage/pull.go
View file

@ -11,7 +11,7 @@ import (
"time" "time"
"github.com/containerd/containerd/content" "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/images"
"github.com/containerd/containerd/platforms" "github.com/containerd/containerd/platforms"
ctdreference "github.com/containerd/containerd/reference" ctdreference "github.com/containerd/containerd/reference"
@ -36,7 +36,7 @@ import (
"github.com/moby/buildkit/util/progress" "github.com/moby/buildkit/util/progress"
"github.com/moby/buildkit/util/resolver" "github.com/moby/buildkit/util/resolver"
"github.com/moby/buildkit/util/tracing" "github.com/moby/buildkit/util/tracing"
digest "github.com/opencontainers/go-digest" "github.com/opencontainers/go-digest"
"github.com/opencontainers/image-spec/identity" "github.com/opencontainers/image-spec/identity"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/pkg/errors" "github.com/pkg/errors"
@ -654,7 +654,7 @@ func showProgress(ctx context.Context, ongoing *jobs, cs content.Store, pw progr
if !j.done { if !j.done {
info, err := cs.Info(context.TODO(), j.Digest) info, err := cs.Info(context.TODO(), j.Digest)
if err != nil { if err != nil {
if errdefs.IsNotFound(err) { if containerderrors.IsNotFound(err) {
// pw.Write(j.Digest.String(), progress.Status{ // pw.Write(j.Digest.String(), progress.Status{
// Action: "waiting", // Action: "waiting",
// }) // })