vbatts/containerd
1
0
Fork 0
Code Pull requests Releases Activity

Rewrite imports for new github org

Browse source 
This rewrites the Go imports after switching to the new github org.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2017-04-03 13:14:15 -07:00
parent 0521958ac0
commit 4f2b443a27
101 changed files with 540 additions and 543 deletions
Download patch file Download diff file Expand all files Collapse all files

10
cmd/containerd-shim/main.go
View file

@ -11,12 +11,12 @@ import (
"google.golang.org/grpc"
"github.com/Sirupsen/logrus"
"github.com/containerd/containerd"
shimapi "github.com/containerd/containerd/api/services/shim"
"github.com/containerd/containerd/linux/shim"
"github.com/containerd/containerd/reaper"
"github.com/containerd/containerd/sys"
runc "github.com/crosbymichael/go-runc"
"github.com/docker/containerd"
shimapi "github.com/docker/containerd/api/services/shim"
"github.com/docker/containerd/linux/shim"
"github.com/docker/containerd/reaper"
"github.com/docker/containerd/sys"
"github.com/urfave/cli"
)

18
cmd/containerd/builtins.go
View file

@ -2,13 +2,13 @@ package main
// register containerd builtins here
import (
_ "github.com/docker/containerd/linux"
_ "github.com/docker/containerd/metrics/cgroups"
_ "github.com/docker/containerd/services/content"
_ "github.com/docker/containerd/services/execution"
_ "github.com/docker/containerd/services/healthcheck"
_ "github.com/docker/containerd/services/metrics"
_ "github.com/docker/containerd/services/rootfs"
_ "github.com/docker/containerd/snapshot/btrfs"
_ "github.com/docker/containerd/snapshot/overlay"
_ "github.com/containerd/containerd/linux"
_ "github.com/containerd/containerd/metrics/cgroups"
_ "github.com/containerd/containerd/services/content"
_ "github.com/containerd/containerd/services/execution"
_ "github.com/containerd/containerd/services/healthcheck"
_ "github.com/containerd/containerd/services/metrics"
_ "github.com/containerd/containerd/services/rootfs"
_ "github.com/containerd/containerd/snapshot/btrfs"
_ "github.com/containerd/containerd/snapshot/overlay"
)

20
cmd/containerd/main.go
View file

@ -16,16 +16,16 @@ import (
"google.golang.org/grpc"
"github.com/Sirupsen/logrus"
"github.com/docker/containerd"
contentapi "github.com/docker/containerd/api/services/content"
api "github.com/docker/containerd/api/services/execution"
rootfsapi "github.com/docker/containerd/api/services/rootfs"
"github.com/docker/containerd/content"
"github.com/docker/containerd/log"
"github.com/docker/containerd/plugin"
"github.com/docker/containerd/reaper"
"github.com/docker/containerd/snapshot"
"github.com/docker/containerd/sys"
"github.com/containerd/containerd"
contentapi "github.com/containerd/containerd/api/services/content"
api "github.com/containerd/containerd/api/services/execution"
rootfsapi "github.com/containerd/containerd/api/services/rootfs"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/plugin"
"github.com/containerd/containerd/reaper"
"github.com/containerd/containerd/snapshot"
"github.com/containerd/containerd/sys"
metrics "github.com/docker/go-metrics"
"github.com/pkg/errors"
"github.com/urfave/cli"

2
cmd/ctr/delete.go
View file

@ -4,7 +4,7 @@ import (
gocontext "context"
"errors"
"github.com/docker/containerd/api/services/execution"
"github.com/containerd/containerd/api/services/execution"
"github.com/urfave/cli"
)

2
cmd/ctr/events.go
View file

@ -6,7 +6,7 @@ import (
"os"
"text/tabwriter"
"github.com/docker/containerd/api/services/execution"
"github.com/containerd/containerd/api/services/execution"
"github.com/urfave/cli"
)

2
cmd/ctr/info.go
View file

@ -6,7 +6,7 @@ import (
gocontext "context"
"fmt"
"github.com/docker/containerd/api/services/execution"
"github.com/containerd/containerd/api/services/execution"
"github.com/pkg/errors"
"github.com/urfave/cli"
)

2
cmd/ctr/list.go
View file

@ -6,7 +6,7 @@ import (
"os"
"text/tabwriter"
"github.com/docker/containerd/api/services/execution"
"github.com/containerd/containerd/api/services/execution"
"github.com/urfave/cli"
)

2
cmd/ctr/main.go
View file

@ -5,7 +5,7 @@ import (
"os"
"github.com/Sirupsen/logrus"
"github.com/docker/containerd"
"github.com/containerd/containerd"
"github.com/urfave/cli"
)

6
cmd/ctr/run.go
View file

@ -13,10 +13,10 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
"github.com/containerd/containerd/api/services/execution"
rootfsapi "github.com/containerd/containerd/api/services/rootfs"
"github.com/containerd/containerd/images"
"github.com/crosbymichael/console"
"github.com/docker/containerd/api/services/execution"
rootfsapi "github.com/docker/containerd/api/services/rootfs"
"github.com/docker/containerd/images"
protobuf "github.com/gogo/protobuf/types"
"github.com/opencontainers/image-spec/identity"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"

2
cmd/ctr/shim.go
View file

@ -17,8 +17,8 @@ import (
"google.golang.org/grpc/grpclog"
"github.com/Sirupsen/logrus"
"github.com/containerd/containerd/api/services/shim"
"github.com/crosbymichael/console"
"github.com/docker/containerd/api/services/shim"
protobuf "github.com/gogo/protobuf/types"
"github.com/opencontainers/runtime-spec/specs-go"
"github.com/pkg/errors"

14
cmd/ctr/utils.go
View file

@ -15,13 +15,13 @@ import (
gocontext "context"
"github.com/boltdb/bolt"
contentapi "github.com/docker/containerd/api/services/content"
"github.com/docker/containerd/api/services/execution"
rootfsapi "github.com/docker/containerd/api/services/rootfs"
"github.com/docker/containerd/api/types/container"
"github.com/docker/containerd/content"
"github.com/docker/containerd/images"
contentservice "github.com/docker/containerd/services/content"
contentapi "github.com/containerd/containerd/api/services/content"
"github.com/containerd/containerd/api/services/execution"
rootfsapi "github.com/containerd/containerd/api/services/rootfs"
"github.com/containerd/containerd/api/types/container"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
contentservice "github.com/containerd/containerd/services/content"
"github.com/pkg/errors"
"github.com/tonistiigi/fifo"
"github.com/urfave/cli"

6
cmd/dist/apply.go vendored
View file

@ -4,9 +4,9 @@ import (
contextpkg "context"
"os"
"github.com/docker/containerd/archive"
"github.com/docker/containerd/archive/compression"
"github.com/docker/containerd/log"
"github.com/containerd/containerd/archive"
"github.com/containerd/containerd/archive/compression"
"github.com/containerd/containerd/log"
"github.com/urfave/cli"
)

8
cmd/dist/common.go vendored
View file

@ -7,10 +7,10 @@ import (
"time"
"github.com/boltdb/bolt"
"github.com/docker/containerd/content"
"github.com/docker/containerd/images"
"github.com/docker/containerd/remotes"
"github.com/docker/containerd/remotes/docker"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/remotes"
"github.com/containerd/containerd/remotes/docker"
"github.com/urfave/cli"
"google.golang.org/grpc"
)

4
cmd/dist/delete.go vendored
View file

@ -6,8 +6,8 @@ import (
"google.golang.org/grpc"
"google.golang.org/grpc/codes"
contentapi "github.com/docker/containerd/api/services/content"
"github.com/docker/containerd/log"
contentapi "github.com/containerd/containerd/api/services/content"
"github.com/containerd/containerd/log"
digest "github.com/opencontainers/go-digest"
"github.com/urfave/cli"
)

12
cmd/dist/fetch.go vendored
View file

@ -9,12 +9,12 @@ import (
"text/tabwriter"
"time"
contentapi "github.com/docker/containerd/api/services/content"
"github.com/docker/containerd/images"
"github.com/docker/containerd/log"
"github.com/docker/containerd/progress"
"github.com/docker/containerd/remotes"
contentservice "github.com/docker/containerd/services/content"
contentapi "github.com/containerd/containerd/api/services/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/progress"
"github.com/containerd/containerd/remotes"
contentservice "github.com/containerd/containerd/services/content"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/urfave/cli"
"golang.org/x/sync/errgroup"

2
cmd/dist/fetchobject.go vendored
View file

@ -5,7 +5,7 @@ import (
"io"
"os"
"github.com/docker/containerd/log"
"github.com/containerd/containerd/log"
"github.com/urfave/cli"
)

4
cmd/dist/get.go vendored
View file

@ -4,8 +4,8 @@ import (
"io"
"os"
contentapi "github.com/docker/containerd/api/services/content"
contentservice "github.com/docker/containerd/services/content"
contentapi "github.com/containerd/containerd/api/services/content"
contentservice "github.com/containerd/containerd/services/content"
digest "github.com/opencontainers/go-digest"
"github.com/urfave/cli"
)

10
cmd/dist/images.go vendored
View file

@ -5,11 +5,11 @@ import (
"os"
"text/tabwriter"
contentapi "github.com/docker/containerd/api/services/content"
"github.com/docker/containerd/images"
"github.com/docker/containerd/log"
"github.com/docker/containerd/progress"
contentservice "github.com/docker/containerd/services/content"
contentapi "github.com/containerd/containerd/api/services/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/progress"
contentservice "github.com/containerd/containerd/services/content"
"github.com/pkg/errors"
"github.com/urfave/cli"
)

6
cmd/dist/ingest.go vendored
View file

@ -4,9 +4,9 @@ import (
contextpkg "context"
"os"
contentapi "github.com/docker/containerd/api/services/content"
"github.com/docker/containerd/content"
contentservice "github.com/docker/containerd/services/content"
contentapi "github.com/containerd/containerd/api/services/content"
"github.com/containerd/containerd/content"
contentservice "github.com/containerd/containerd/services/content"
"github.com/opencontainers/go-digest"
"github.com/pkg/errors"
"github.com/urfave/cli"

4
cmd/dist/list.go vendored
View file

@ -7,8 +7,8 @@ import (
"text/tabwriter"
"time"
"github.com/docker/containerd/content"
"github.com/docker/containerd/log"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/log"
units "github.com/docker/go-units"
digest "github.com/opencontainers/go-digest"
"github.com/urfave/cli"

2
cmd/dist/main.go vendored
View file

@ -6,7 +6,7 @@ import (
"os"
"github.com/Sirupsen/logrus"
"github.com/docker/containerd"
"github.com/containerd/containerd"
"github.com/urfave/cli"
)

18
cmd/dist/pull.go vendored
View file

@ -7,15 +7,15 @@ import (
"text/tabwriter"
"time"
contentapi "github.com/docker/containerd/api/services/content"
rootfsapi "github.com/docker/containerd/api/services/rootfs"
"github.com/docker/containerd/content"
"github.com/docker/containerd/images"
"github.com/docker/containerd/log"
"github.com/docker/containerd/progress"
"github.com/docker/containerd/remotes"
contentservice "github.com/docker/containerd/services/content"
rootfsservice "github.com/docker/containerd/services/rootfs"
contentapi "github.com/containerd/containerd/api/services/content"
rootfsapi "github.com/containerd/containerd/api/services/rootfs"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/images"
"github.com/containerd/containerd/log"
"github.com/containerd/containerd/progress"
"github.com/containerd/containerd/remotes"
contentservice "github.com/containerd/containerd/services/content"
rootfsservice "github.com/containerd/containerd/services/rootfs"
"github.com/opencontainers/image-spec/identity"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/urfave/cli"

12
cmd/dist/rootfs.go vendored
View file

@ -8,12 +8,12 @@ import (
"os"
"strings"
contentapi "github.com/docker/containerd/api/services/content"
rootfsapi "github.com/docker/containerd/api/services/rootfs"
"github.com/docker/containerd/content"
"github.com/docker/containerd/log"
contentservice "github.com/docker/containerd/services/content"
rootfsservice "github.com/docker/containerd/services/rootfs"
contentapi "github.com/containerd/containerd/api/services/content"
rootfsapi "github.com/containerd/containerd/api/services/rootfs"
"github.com/containerd/containerd/content"
"github.com/containerd/containerd/log"
contentservice "github.com/containerd/containerd/services/content"
rootfsservice "github.com/containerd/containerd/services/rootfs"
digest "github.com/opencontainers/go-digest"
ocispec "github.com/opencontainers/image-spec/specs-go/v1"
"github.com/urfave/cli"