X Tutup
Skip to content

Commit 12a6bea

Browse files
stevvooestevvooe
committed
*: update import paths to use versioned services
Signed-off-by: Stephen J Day <stephen.day@docker.com>
1 parent 782d783 commit 12a6bea

38 files changed

+67
-67
lines changed

‎client.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,15 @@ import (
1010
"sync"
1111
"time"
1212

13-
"github.com/containerd/containerd/api/services/containers"
14-
contentapi "github.com/containerd/containerd/api/services/content"
15-
diffapi "github.com/containerd/containerd/api/services/diff"
16-
eventsapi "github.com/containerd/containerd/api/services/events"
17-
imagesapi "github.com/containerd/containerd/api/services/images"
18-
namespacesapi "github.com/containerd/containerd/api/services/namespaces"
19-
snapshotapi "github.com/containerd/containerd/api/services/snapshot"
20-
"github.com/containerd/containerd/api/services/tasks"
21-
versionservice "github.com/containerd/containerd/api/services/version"
13+
"github.com/containerd/containerd/api/services/containers/v1"
14+
contentapi "github.com/containerd/containerd/api/services/content/v1"
15+
diffapi "github.com/containerd/containerd/api/services/diff/v1"
16+
eventsapi "github.com/containerd/containerd/api/services/events/v1"
17+
imagesapi "github.com/containerd/containerd/api/services/images/v1"
18+
namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1"
19+
snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
20+
"github.com/containerd/containerd/api/services/tasks/v1"
21+
versionservice "github.com/containerd/containerd/api/services/version/v1"
2222
"github.com/containerd/containerd/content"
2323
"github.com/containerd/containerd/images"
2424
"github.com/containerd/containerd/plugin"

‎cmd/containerd-shim/main_unix.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ import (
1313
"google.golang.org/grpc"
1414

1515
"github.com/Sirupsen/logrus"
16-
shimapi "github.com/containerd/containerd/api/services/shim"
16+
shimapi "github.com/containerd/containerd/api/services/shim/v1"
1717
"github.com/containerd/containerd/linux/shim"
1818
"github.com/containerd/containerd/reaper"
1919
"github.com/containerd/containerd/version"

‎cmd/containerd/main.go‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@ import (
1818
"google.golang.org/grpc/health/grpc_health_v1"
1919

2020
"github.com/Sirupsen/logrus"
21-
containersapi "github.com/containerd/containerd/api/services/containers"
22-
contentapi "github.com/containerd/containerd/api/services/content"
23-
diffapi "github.com/containerd/containerd/api/services/diff"
24-
imagesapi "github.com/containerd/containerd/api/services/images"
25-
namespacesapi "github.com/containerd/containerd/api/services/namespaces"
26-
snapshotapi "github.com/containerd/containerd/api/services/snapshot"
27-
api "github.com/containerd/containerd/api/services/tasks"
28-
versionapi "github.com/containerd/containerd/api/services/version"
21+
containersapi "github.com/containerd/containerd/api/services/containers/v1"
22+
contentapi "github.com/containerd/containerd/api/services/content/v1"
23+
diffapi "github.com/containerd/containerd/api/services/diff/v1"
24+
imagesapi "github.com/containerd/containerd/api/services/images/v1"
25+
namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1"
26+
snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
27+
api "github.com/containerd/containerd/api/services/tasks/v1"
28+
versionapi "github.com/containerd/containerd/api/services/version/v1"
2929
"github.com/containerd/containerd/content"
3030
"github.com/containerd/containerd/events"
3131
"github.com/containerd/containerd/log"

‎cmd/ctr/events.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"strings"
77
"text/tabwriter"
88

9-
eventsapi "github.com/containerd/containerd/api/services/events"
9+
eventsapi "github.com/containerd/containerd/api/services/events/v1"
1010
"github.com/containerd/containerd/api/types/event"
1111
"github.com/gogo/protobuf/proto"
1212
"github.com/urfave/cli"

‎cmd/ctr/run_windows.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ import (
1111
"github.com/Sirupsen/logrus"
1212
"github.com/containerd/console"
1313
"github.com/containerd/containerd"
14-
containersapi "github.com/containerd/containerd/api/services/containers"
15-
"github.com/containerd/containerd/api/services/tasks"
14+
containersapi "github.com/containerd/containerd/api/services/containers/v1"
15+
"github.com/containerd/containerd/api/services/tasks/v1"
1616
"github.com/containerd/containerd/log"
1717
"github.com/containerd/containerd/mount"
1818
"github.com/containerd/containerd/windows"

‎cmd/ctr/shim.go‎

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

2020
"github.com/Sirupsen/logrus"
2121
"github.com/containerd/console"
22-
"github.com/containerd/containerd/api/services/shim"
22+
"github.com/containerd/containerd/api/services/shim/v1"
2323
protobuf "github.com/gogo/protobuf/types"
2424
"github.com/opencontainers/runtime-spec/specs-go"
2525
"github.com/pkg/errors"

‎cmd/ctr/utils.go‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,15 @@ import (
1212

1313
"github.com/Sirupsen/logrus"
1414
"github.com/containerd/containerd"
15-
containersapi "github.com/containerd/containerd/api/services/containers"
16-
contentapi "github.com/containerd/containerd/api/services/content"
17-
diffapi "github.com/containerd/containerd/api/services/diff"
18-
"github.com/containerd/containerd/api/services/events"
19-
imagesapi "github.com/containerd/containerd/api/services/images"
20-
namespacesapi "github.com/containerd/containerd/api/services/namespaces"
21-
snapshotapi "github.com/containerd/containerd/api/services/snapshot"
22-
"github.com/containerd/containerd/api/services/tasks"
23-
versionservice "github.com/containerd/containerd/api/services/version"
15+
containersapi "github.com/containerd/containerd/api/services/containers/v1"
16+
contentapi "github.com/containerd/containerd/api/services/content/v1"
17+
diffapi "github.com/containerd/containerd/api/services/diff/v1"
18+
"github.com/containerd/containerd/api/services/events/v1"
19+
imagesapi "github.com/containerd/containerd/api/services/images/v1"
20+
namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1"
21+
snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
22+
"github.com/containerd/containerd/api/services/tasks/v1"
23+
versionservice "github.com/containerd/containerd/api/services/version/v1"
2424
"github.com/containerd/containerd/content"
2525
"github.com/containerd/containerd/images"
2626
"github.com/containerd/containerd/namespaces"

‎container.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ import (
99
"google.golang.org/grpc"
1010
"google.golang.org/grpc/codes"
1111

12-
"github.com/containerd/containerd/api/services/containers"
13-
"github.com/containerd/containerd/api/services/tasks"
12+
"github.com/containerd/containerd/api/services/containers/v1"
13+
"github.com/containerd/containerd/api/services/tasks/v1"
1414
"github.com/containerd/containerd/api/types/mount"
1515
specs "github.com/opencontainers/runtime-spec/specs-go"
1616
"github.com/pkg/errors"

‎container_unix.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ import (
88
"fmt"
99
"io/ioutil"
1010

11-
"github.com/containerd/containerd/api/services/containers"
12-
"github.com/containerd/containerd/api/services/tasks"
11+
"github.com/containerd/containerd/api/services/containers/v1"
12+
"github.com/containerd/containerd/api/services/tasks/v1"
1313
"github.com/containerd/containerd/api/types/descriptor"
1414
"github.com/containerd/containerd/content"
1515
"github.com/containerd/containerd/images"

‎linux/runtime.go‎

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

1717
"google.golang.org/grpc"
1818

19-
"github.com/containerd/containerd/api/services/shim"
19+
"github.com/containerd/containerd/api/services/shim/v1"
2020
"github.com/containerd/containerd/api/types/event"
2121
"github.com/containerd/containerd/api/types/mount"
2222
"github.com/containerd/containerd/api/types/task"

0 commit comments

Comments
 (0)
X Tutup