Skip to content

Commit 308341a

Browse files
committed
replace uses of github.com/containerd/containerd/errdefs
Signed-off-by: Sebastiaan van Stijn <[email protected]>
1 parent 47ff8cf commit 308341a

228 files changed

Lines changed: 231 additions & 232 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

client.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,6 @@ import (
4444
"github.com/containerd/containerd/content"
4545
contentproxy "github.com/containerd/containerd/content/proxy"
4646
"github.com/containerd/containerd/defaults"
47-
"github.com/containerd/containerd/errdefs"
4847
"github.com/containerd/containerd/events"
4948
"github.com/containerd/containerd/images"
5049
"github.com/containerd/containerd/leases"
@@ -61,6 +60,7 @@ import (
6160
"github.com/containerd/containerd/services/introspection"
6261
"github.com/containerd/containerd/snapshots"
6362
snproxy "github.com/containerd/containerd/snapshots/proxy"
63+
"github.com/containerd/errdefs"
6464
"github.com/containerd/typeurl/v2"
6565
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
6666
"github.com/opencontainers/runtime-spec/specs-go"

cmd/containerd/command/main.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,14 +28,14 @@ import (
2828
"time"
2929

3030
"github.com/containerd/containerd/defaults"
31-
"github.com/containerd/containerd/errdefs"
3231
"github.com/containerd/containerd/log"
3332
_ "github.com/containerd/containerd/metrics" // import containerd build info
3433
"github.com/containerd/containerd/mount"
3534
"github.com/containerd/containerd/services/server"
3635
srvconfig "github.com/containerd/containerd/services/server/config"
3736
"github.com/containerd/containerd/sys"
3837
"github.com/containerd/containerd/version"
38+
"github.com/containerd/errdefs"
3939
"github.com/urfave/cli"
4040
"google.golang.org/grpc/grpclog"
4141
)

cmd/containerd/command/publish.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525
"time"
2626

2727
eventsapi "github.com/containerd/containerd/api/services/events/v1"
28-
"github.com/containerd/containerd/errdefs"
2928
"github.com/containerd/containerd/namespaces"
3029
"github.com/containerd/containerd/pkg/dialer"
3130
"github.com/containerd/containerd/protobuf/proto"
3231
"github.com/containerd/containerd/protobuf/types"
32+
"github.com/containerd/errdefs"
3333
"github.com/urfave/cli"
3434
"google.golang.org/grpc"
3535
"google.golang.org/grpc/backoff"

cmd/containerd/command/service_windows.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ import (
2424
"path/filepath"
2525
"time"
2626

27-
"github.com/containerd/containerd/errdefs"
2827
"github.com/containerd/containerd/services/server"
28+
"github.com/containerd/errdefs"
2929
"github.com/sirupsen/logrus"
3030
"github.com/urfave/cli"
3131
"golang.org/x/sys/windows"

cmd/ctr/commands/containers/checkpoint.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import (
2222

2323
"github.com/containerd/containerd"
2424
"github.com/containerd/containerd/cmd/ctr/commands"
25-
"github.com/containerd/containerd/errdefs"
25+
"github.com/containerd/errdefs"
2626
"github.com/urfave/cli"
2727
)
2828

cmd/ctr/commands/containers/containers.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ import (
2828
"github.com/containerd/containerd/cmd/ctr/commands"
2929
"github.com/containerd/containerd/cmd/ctr/commands/run"
3030
"github.com/containerd/containerd/containers"
31-
"github.com/containerd/containerd/errdefs"
3231
"github.com/containerd/containerd/log"
32+
"github.com/containerd/errdefs"
3333
"github.com/containerd/typeurl/v2"
3434
"github.com/urfave/cli"
3535
)

cmd/ctr/commands/containers/restore.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ import (
2424
"github.com/containerd/containerd/cio"
2525
"github.com/containerd/containerd/cmd/ctr/commands"
2626
"github.com/containerd/containerd/cmd/ctr/commands/tasks"
27-
"github.com/containerd/containerd/errdefs"
27+
"github.com/containerd/errdefs"
2828
"github.com/sirupsen/logrus"
2929
"github.com/urfave/cli"
3030
)

cmd/ctr/commands/content/content.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ import (
2929

3030
"github.com/containerd/containerd/cmd/ctr/commands"
3131
"github.com/containerd/containerd/content"
32-
"github.com/containerd/containerd/errdefs"
3332
"github.com/containerd/containerd/log"
3433
"github.com/containerd/containerd/remotes"
34+
"github.com/containerd/errdefs"
3535
units "github.com/docker/go-units"
3636
digest "github.com/opencontainers/go-digest"
3737
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

cmd/ctr/commands/content/fetch.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,12 @@ import (
2929
"github.com/containerd/containerd"
3030
"github.com/containerd/containerd/cmd/ctr/commands"
3131
"github.com/containerd/containerd/content"
32-
"github.com/containerd/containerd/errdefs"
3332
"github.com/containerd/containerd/images"
3433
"github.com/containerd/containerd/log"
3534
"github.com/containerd/containerd/pkg/progress"
3635
"github.com/containerd/containerd/platforms"
3736
"github.com/containerd/containerd/remotes"
37+
"github.com/containerd/errdefs"
3838
"github.com/opencontainers/go-digest"
3939
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
4040
"github.com/urfave/cli"

cmd/ctr/commands/images/images.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,11 +25,11 @@ import (
2525
"text/tabwriter"
2626

2727
"github.com/containerd/containerd/cmd/ctr/commands"
28-
"github.com/containerd/containerd/errdefs"
2928
"github.com/containerd/containerd/images"
3029
"github.com/containerd/containerd/log"
3130
"github.com/containerd/containerd/pkg/progress"
3231
"github.com/containerd/containerd/platforms"
32+
"github.com/containerd/errdefs"
3333
"github.com/urfave/cli"
3434
)
3535

0 commit comments

Comments
 (0)