github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

*: update import paths to use versioned services

Browse Source 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
This commit is contained in:
Stephen J Day 2017-06-21 18:29:06 -07:00
parent 782d78346d
commit 12a6beaeeb
No known key found for this signature in database
GPG Key ID: 67B3DED84EDC823F
38 changed files with 67 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
client.go
View File

@ -10,15 +10,15 @@ import (
"sync" "sync"
"time" "time"
"github.com/containerd/containerd/api/services/containers" "github.com/containerd/containerd/api/services/containers/v1"
contentapi "github.com/containerd/containerd/api/services/content" contentapi "github.com/containerd/containerd/api/services/content/v1"
diffapi "github.com/containerd/containerd/api/services/diff" diffapi "github.com/containerd/containerd/api/services/diff/v1"
eventsapi "github.com/containerd/containerd/api/services/events" eventsapi "github.com/containerd/containerd/api/services/events/v1"
imagesapi "github.com/containerd/containerd/api/services/images" imagesapi "github.com/containerd/containerd/api/services/images/v1"
namespacesapi "github.com/containerd/containerd/api/services/namespaces" namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1"
snapshotapi "github.com/containerd/containerd/api/services/snapshot" snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
"github.com/containerd/containerd/api/services/tasks" "github.com/containerd/containerd/api/services/tasks/v1"
versionservice "github.com/containerd/containerd/api/services/version" versionservice "github.com/containerd/containerd/api/services/version/v1"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"

2
cmd/containerd-shim/main_unix.go
View File

@ -13,7 +13,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
shimapi "github.com/containerd/containerd/api/services/shim" shimapi "github.com/containerd/containerd/api/services/shim/v1"
"github.com/containerd/containerd/linux/shim" "github.com/containerd/containerd/linux/shim"
"github.com/containerd/containerd/reaper" "github.com/containerd/containerd/reaper"
"github.com/containerd/containerd/version" "github.com/containerd/containerd/version"

16
cmd/containerd/main.go
View File

@ -18,14 +18,14 @@ import (
"google.golang.org/grpc/health/grpc_health_v1" "google.golang.org/grpc/health/grpc_health_v1"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
containersapi "github.com/containerd/containerd/api/services/containers" containersapi "github.com/containerd/containerd/api/services/containers/v1"
contentapi "github.com/containerd/containerd/api/services/content" contentapi "github.com/containerd/containerd/api/services/content/v1"
diffapi "github.com/containerd/containerd/api/services/diff" diffapi "github.com/containerd/containerd/api/services/diff/v1"
imagesapi "github.com/containerd/containerd/api/services/images" imagesapi "github.com/containerd/containerd/api/services/images/v1"
namespacesapi "github.com/containerd/containerd/api/services/namespaces" namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1"
snapshotapi "github.com/containerd/containerd/api/services/snapshot" snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
api "github.com/containerd/containerd/api/services/tasks" api "github.com/containerd/containerd/api/services/tasks/v1"
versionapi "github.com/containerd/containerd/api/services/version" versionapi "github.com/containerd/containerd/api/services/version/v1"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"

2
cmd/ctr/events.go
View File

@ -6,7 +6,7 @@ import (
"strings" "strings"
"text/tabwriter" "text/tabwriter"
eventsapi "github.com/containerd/containerd/api/services/events" eventsapi "github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/api/types/event"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"
"github.com/urfave/cli" "github.com/urfave/cli"

4
cmd/ctr/run_windows.go
View File

@ -11,8 +11,8 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd" "github.com/containerd/containerd"
containersapi "github.com/containerd/containerd/api/services/containers" containersapi "github.com/containerd/containerd/api/services/containers/v1"
"github.com/containerd/containerd/api/services/tasks" "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
"github.com/containerd/containerd/windows" "github.com/containerd/containerd/windows"

2
cmd/ctr/shim.go
View File

@ -19,7 +19,7 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/containerd/console" "github.com/containerd/console"
"github.com/containerd/containerd/api/services/shim" "github.com/containerd/containerd/api/services/shim/v1"
protobuf "github.com/gogo/protobuf/types" protobuf "github.com/gogo/protobuf/types"
"github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors" "github.com/pkg/errors"

18
cmd/ctr/utils.go
View File

@ -12,15 +12,15 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/containerd/containerd" "github.com/containerd/containerd"
containersapi "github.com/containerd/containerd/api/services/containers" containersapi "github.com/containerd/containerd/api/services/containers/v1"
contentapi "github.com/containerd/containerd/api/services/content" contentapi "github.com/containerd/containerd/api/services/content/v1"
diffapi "github.com/containerd/containerd/api/services/diff" diffapi "github.com/containerd/containerd/api/services/diff/v1"
"github.com/containerd/containerd/api/services/events" "github.com/containerd/containerd/api/services/events/v1"
imagesapi "github.com/containerd/containerd/api/services/images" imagesapi "github.com/containerd/containerd/api/services/images/v1"
namespacesapi "github.com/containerd/containerd/api/services/namespaces" namespacesapi "github.com/containerd/containerd/api/services/namespaces/v1"
snapshotapi "github.com/containerd/containerd/api/services/snapshot" snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
"github.com/containerd/containerd/api/services/tasks" "github.com/containerd/containerd/api/services/tasks/v1"
versionservice "github.com/containerd/containerd/api/services/version" versionservice "github.com/containerd/containerd/api/services/version/v1"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"

4
container.go
View File

@ -9,8 +9,8 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
"github.com/containerd/containerd/api/services/containers" "github.com/containerd/containerd/api/services/containers/v1"
"github.com/containerd/containerd/api/services/tasks" "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types/mount" "github.com/containerd/containerd/api/types/mount"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors" "github.com/pkg/errors"

4
container_unix.go
View File

@ -8,8 +8,8 @@ import (
"fmt" "fmt"
"io/ioutil" "io/ioutil"
"github.com/containerd/containerd/api/services/containers" "github.com/containerd/containerd/api/services/containers/v1"
"github.com/containerd/containerd/api/services/tasks" "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/api/types/descriptor"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"

2
linux/runtime.go
View File

@ -16,7 +16,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"github.com/containerd/containerd/api/services/shim" "github.com/containerd/containerd/api/services/shim/v1"
"github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/api/types/event"
"github.com/containerd/containerd/api/types/mount" "github.com/containerd/containerd/api/types/mount"
"github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/api/types/task"

2
linux/shim.go
View File

@ -13,7 +13,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"github.com/containerd/containerd/api/services/shim" "github.com/containerd/containerd/api/services/shim/v1"
localShim "github.com/containerd/containerd/linux/shim" localShim "github.com/containerd/containerd/linux/shim"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/containerd/containerd/reaper" "github.com/containerd/containerd/reaper"

2
linux/shim/client.go
View File

@ -6,7 +6,7 @@ import (
"path/filepath" "path/filepath"
"syscall" "syscall"
shimapi "github.com/containerd/containerd/api/services/shim" shimapi "github.com/containerd/containerd/api/services/shim/v1"
"github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/api/types/task"
runc "github.com/containerd/go-runc" runc "github.com/containerd/go-runc"
google_protobuf "github.com/golang/protobuf/ptypes/empty" google_protobuf "github.com/golang/protobuf/ptypes/empty"

2
linux/shim/exec.go
View File

@ -16,7 +16,7 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"github.com/containerd/console" "github.com/containerd/console"
shimapi "github.com/containerd/containerd/api/services/shim" shimapi "github.com/containerd/containerd/api/services/shim/v1"
"github.com/containerd/fifo" "github.com/containerd/fifo"
runc "github.com/containerd/go-runc" runc "github.com/containerd/go-runc"
specs "github.com/opencontainers/runtime-spec/specs-go" specs "github.com/opencontainers/runtime-spec/specs-go"

2
linux/shim/init.go
View File

@ -17,7 +17,7 @@ import (
"golang.org/x/sys/unix" "golang.org/x/sys/unix"
"github.com/containerd/console" "github.com/containerd/console"
shimapi "github.com/containerd/containerd/api/services/shim" shimapi "github.com/containerd/containerd/api/services/shim/v1"
"github.com/containerd/containerd/log" "github.com/containerd/containerd/log"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
"github.com/containerd/fifo" "github.com/containerd/fifo"

2
linux/shim/service.go
View File

@ -9,7 +9,7 @@ import (
"syscall" "syscall"
"github.com/containerd/console" "github.com/containerd/console"
shimapi "github.com/containerd/containerd/api/services/shim" shimapi "github.com/containerd/containerd/api/services/shim/v1"
"github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/reaper" "github.com/containerd/containerd/reaper"
google_protobuf "github.com/golang/protobuf/ptypes/empty" google_protobuf "github.com/golang/protobuf/ptypes/empty"

2
linux/task.go
View File

@ -7,7 +7,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"github.com/containerd/containerd/api/services/shim" "github.com/containerd/containerd/api/services/shim/v1"
"github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
protobuf "github.com/gogo/protobuf/types" protobuf "github.com/gogo/protobuf/types"

4
process.go
View File

@ -5,8 +5,8 @@ import (
"encoding/json" "encoding/json"
"syscall" "syscall"
eventsapi "github.com/containerd/containerd/api/services/events" eventsapi "github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/api/services/tasks" "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/api/types/event"
tasktypes "github.com/containerd/containerd/api/types/task" tasktypes "github.com/containerd/containerd/api/types/task"
"github.com/gogo/protobuf/proto" "github.com/gogo/protobuf/proto"

2
services/containers/helpers.go
View File

@ -1,7 +1,7 @@
package containers package containers
import ( import (
api "github.com/containerd/containerd/api/services/containers" api "github.com/containerd/containerd/api/services/containers/v1"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
"github.com/containerd/containerd/metadata" "github.com/containerd/containerd/metadata"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"

2
services/containers/service.go
View File

@ -2,7 +2,7 @@ package containers
import ( import (
"github.com/boltdb/bolt" "github.com/boltdb/bolt"
api "github.com/containerd/containerd/api/services/containers" api "github.com/containerd/containerd/api/services/containers/v1"
"github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/api/types/event"
"github.com/containerd/containerd/containers" "github.com/containerd/containerd/containers"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"

2
services/content/reader.go
View File

@ -3,7 +3,7 @@ package content
import ( import (
"context" "context"
contentapi "github.com/containerd/containerd/api/services/content" contentapi "github.com/containerd/containerd/api/services/content/v1"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
) )

2
services/content/service.go
View File

@ -5,7 +5,7 @@ import (
"sync" "sync"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
api "github.com/containerd/containerd/api/services/content" api "github.com/containerd/containerd/api/services/content/v1"
"github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/api/types/event"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"

2
services/content/store.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"io" "io"
contentapi "github.com/containerd/containerd/api/services/content" contentapi "github.com/containerd/containerd/api/services/content/v1"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
) )

2
services/content/writer.go
View File

@ -3,7 +3,7 @@ package content
import ( import (
"io" "io"
contentapi "github.com/containerd/containerd/api/services/content" contentapi "github.com/containerd/containerd/api/services/content/v1"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"
digest "github.com/opencontainers/go-digest" digest "github.com/opencontainers/go-digest"
"github.com/pkg/errors" "github.com/pkg/errors"

2
services/diff/client.go
View File

@ -1,7 +1,7 @@
package diff package diff
import ( import (
diffapi "github.com/containerd/containerd/api/services/diff" diffapi "github.com/containerd/containerd/api/services/diff/v1"
"github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/api/types/descriptor"
mounttypes "github.com/containerd/containerd/api/types/mount" mounttypes "github.com/containerd/containerd/api/types/mount"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"

2
services/diff/service.go
View File

@ -1,7 +1,7 @@
package diff package diff
import ( import (
diffapi "github.com/containerd/containerd/api/services/diff" diffapi "github.com/containerd/containerd/api/services/diff/v1"
mounttypes "github.com/containerd/containerd/api/types/mount" mounttypes "github.com/containerd/containerd/api/types/mount"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"

2
services/events/service.go
View File

@ -5,7 +5,7 @@ import (
"time" "time"
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
api "github.com/containerd/containerd/api/services/events" api "github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
"google.golang.org/grpc" "google.golang.org/grpc"

2
services/images/client.go
View File

@ -3,7 +3,7 @@ package images
import ( import (
"context" "context"
imagesapi "github.com/containerd/containerd/api/services/images" imagesapi "github.com/containerd/containerd/api/services/images/v1"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
ocispec "github.com/opencontainers/image-spec/specs-go/v1" ocispec "github.com/opencontainers/image-spec/specs-go/v1"
) )

2
services/images/helpers.go
View File

@ -1,7 +1,7 @@
package images package images
import ( import (
imagesapi "github.com/containerd/containerd/api/services/images" imagesapi "github.com/containerd/containerd/api/services/images/v1"
"github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/api/types/descriptor"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
"github.com/containerd/containerd/metadata" "github.com/containerd/containerd/metadata"

2
services/images/service.go
View File

@ -2,7 +2,7 @@ package images
import ( import (
"github.com/boltdb/bolt" "github.com/boltdb/bolt"
imagesapi "github.com/containerd/containerd/api/services/images" imagesapi "github.com/containerd/containerd/api/services/images/v1"
"github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/api/types/event"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"

2
services/namespaces/client.go
View File

@ -4,7 +4,7 @@ import (
"context" "context"
"strings" "strings"
api "github.com/containerd/containerd/api/services/namespaces" api "github.com/containerd/containerd/api/services/namespaces/v1"
"github.com/containerd/containerd/namespaces" "github.com/containerd/containerd/namespaces"
"github.com/gogo/protobuf/types" "github.com/gogo/protobuf/types"
) )

2
services/namespaces/service.go
View File

@ -4,7 +4,7 @@ import (
"strings" "strings"
"github.com/boltdb/bolt" "github.com/boltdb/bolt"
api "github.com/containerd/containerd/api/services/namespaces" api "github.com/containerd/containerd/api/services/namespaces/v1"
"github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/api/types/event"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"
"github.com/containerd/containerd/metadata" "github.com/containerd/containerd/metadata"

2
services/snapshot/client.go
View File

@ -8,7 +8,7 @@ import (
"google.golang.org/grpc" "google.golang.org/grpc"
"google.golang.org/grpc/codes" "google.golang.org/grpc/codes"
snapshotapi "github.com/containerd/containerd/api/services/snapshot" snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
mountapi "github.com/containerd/containerd/api/types/mount" mountapi "github.com/containerd/containerd/api/types/mount"
"github.com/containerd/containerd/mount" "github.com/containerd/containerd/mount"
"github.com/containerd/containerd/snapshot" "github.com/containerd/containerd/snapshot"

2
services/snapshot/service.go
View File

@ -3,7 +3,7 @@ package snapshot
import ( import (
gocontext "context" gocontext "context"
snapshotapi "github.com/containerd/containerd/api/services/snapshot" snapshotapi "github.com/containerd/containerd/api/services/snapshot/v1"
"github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/api/types/event"
mounttypes "github.com/containerd/containerd/api/types/mount" mounttypes "github.com/containerd/containerd/api/types/mount"
"github.com/containerd/containerd/events" "github.com/containerd/containerd/events"

2
services/tasks/service.go
View File

@ -9,7 +9,7 @@ import (
"path/filepath" "path/filepath"
"github.com/boltdb/bolt" "github.com/boltdb/bolt"
api "github.com/containerd/containerd/api/services/tasks" api "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types/descriptor" "github.com/containerd/containerd/api/types/descriptor"
"github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/api/types/event"
"github.com/containerd/containerd/api/types/task" "github.com/containerd/containerd/api/types/task"

2
services/version/service.go
View File

@ -1,7 +1,7 @@
package version package version
import ( import (
api "github.com/containerd/containerd/api/services/version" api "github.com/containerd/containerd/api/services/version/v1"
"github.com/containerd/containerd/plugin" "github.com/containerd/containerd/plugin"
ctrdversion "github.com/containerd/containerd/version" ctrdversion "github.com/containerd/containerd/version"
empty "github.com/golang/protobuf/ptypes/empty" empty "github.com/golang/protobuf/ptypes/empty"

2
spec_unix.go
View File

@ -10,7 +10,7 @@ import (
"strconv" "strconv"
"strings" "strings"
"github.com/containerd/containerd/api/services/containers" "github.com/containerd/containerd/api/services/containers/v1"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
protobuf "github.com/gogo/protobuf/types" protobuf "github.com/gogo/protobuf/types"
"github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/image-spec/specs-go/v1"

2
spec_windows.go
View File

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"runtime" "runtime"
"github.com/containerd/containerd/api/services/containers" "github.com/containerd/containerd/api/services/containers/v1"
"github.com/containerd/containerd/images" "github.com/containerd/containerd/images"
protobuf "github.com/gogo/protobuf/types" protobuf "github.com/gogo/protobuf/types"
"github.com/opencontainers/image-spec/specs-go/v1" "github.com/opencontainers/image-spec/specs-go/v1"

6
task.go
View File

@ -10,9 +10,9 @@ import (
"strings" "strings"
"syscall" "syscall"
"github.com/containerd/containerd/api/services/containers" "github.com/containerd/containerd/api/services/containers/v1"
eventsapi "github.com/containerd/containerd/api/services/events" eventsapi "github.com/containerd/containerd/api/services/events/v1"
"github.com/containerd/containerd/api/services/tasks" "github.com/containerd/containerd/api/services/tasks/v1"
"github.com/containerd/containerd/api/types/event" "github.com/containerd/containerd/api/types/event"
tasktypes "github.com/containerd/containerd/api/types/task" tasktypes "github.com/containerd/containerd/api/types/task"
"github.com/containerd/containerd/content" "github.com/containerd/containerd/content"