Update import path to use containerd/containerd instead of docker/docker
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
This commit is contained in:
parent
f58940c45a
commit
793b73880e
|
@ -21,7 +21,7 @@ RUN apt-get update && apt-get install -y \
|
|||
ENV GO_VERSION 1.7.1
|
||||
RUN curl -sSL "https://storage.googleapis.com/golang/go${GO_VERSION}.linux-amd64.tar.gz" | tar -v -C /usr/local -xz
|
||||
ENV PATH /go/bin:/usr/local/go/bin:$PATH
|
||||
ENV GOPATH /go:/go/src/github.com/docker/containerd/vendor
|
||||
ENV GOPATH /go:/go/src/github.com/containerd/containerd/vendor
|
||||
|
||||
ENV GO_TOOLS_COMMIT 823804e1ae08dbb14eb807afc7db9993bc9e3cc3
|
||||
# Grab Go's cover tool for dead-simple code coverage testing
|
||||
|
@ -37,7 +37,7 @@ RUN git clone https://github.com/golang/lint.git /go/src/github.com/golang/lint
|
|||
&& (cd /go/src/github.com/golang/lint && git checkout -q $GO_LINT_COMMIT) \
|
||||
&& go install -v github.com/golang/lint/golint
|
||||
|
||||
WORKDIR /go/src/github.com/docker/containerd
|
||||
WORKDIR /go/src/github.com/containerd/containerd
|
||||
|
||||
# install seccomp: the version shipped in trusty is too old
|
||||
ENV SECCOMP_VERSION 2.3.1
|
||||
|
@ -63,8 +63,8 @@ RUN set -x \
|
|||
&& git checkout -q "$RUNC_COMMIT" \
|
||||
&& make BUILDTAGS="seccomp apparmor selinux" && make install
|
||||
|
||||
COPY . /go/src/github.com/docker/containerd
|
||||
COPY . /go/src/github.com/containerd/containerd
|
||||
|
||||
WORKDIR /go/src/github.com/docker/containerd
|
||||
WORKDIR /go/src/github.com/containerd/containerd
|
||||
|
||||
RUN make all install
|
||||
|
|
6
Makefile
6
Makefile
|
@ -1,11 +1,11 @@
|
|||
BUILDTAGS=
|
||||
|
||||
PROJECT=github.com/docker/containerd
|
||||
PROJECT=github.com/containerd/containerd
|
||||
|
||||
GIT_COMMIT := $(shell git rev-parse HEAD 2> /dev/null || true)
|
||||
GIT_BRANCH := $(shell git rev-parse --abbrev-ref HEAD 2> /dev/null)
|
||||
|
||||
LDFLAGS := -X github.com/docker/containerd.GitCommit=${GIT_COMMIT} ${LDFLAGS}
|
||||
LDFLAGS := -X github.com/containerd/containerd.GitCommit=${GIT_COMMIT} ${LDFLAGS}
|
||||
|
||||
TEST_TIMEOUT ?= 5m
|
||||
TEST_SUITE_TIMEOUT ?= 10m
|
||||
|
@ -91,7 +91,7 @@ test: validate install bundles-rootfs
|
|||
go test -bench=. -v $(shell go list ./... | grep -v /vendor | grep -v /integration-test ) -runtime=$(RUNTIME)
|
||||
ifneq ($(wildcard /.dockerenv), )
|
||||
cd integration-test ; \
|
||||
go test -check.v -check.timeout=$(TEST_TIMEOUT) $(TESTFLAGS) timeout=$(TEST_SUITE_TIMEOUT) github.com/docker/containerd/integration-test
|
||||
go test -check.v -check.timeout=$(TEST_TIMEOUT) $(TESTFLAGS) timeout=$(TEST_SUITE_TIMEOUT) github.com/containerd/containerd/integration-test
|
||||
endif
|
||||
|
||||
bench: shim validate install bundles-rootfs
|
||||
|
|
|
@ -6,7 +6,7 @@ as checkpoint and restore for cloning and live migration of containers.
|
|||
|
||||
## Getting started
|
||||
|
||||
The easiest way to start using containerd is to download binaries from the [releases page](https://github.com/docker/containerd/releases).
|
||||
The easiest way to start using containerd is to download binaries from the [releases page](https://github.com/containerd/containerd/releases).
|
||||
|
||||
The included `ctr` command-line tool allows you interact with the containerd daemon:
|
||||
|
||||
|
|
|
@ -13,10 +13,10 @@ import (
|
|||
"google.golang.org/grpc"
|
||||
"google.golang.org/grpc/codes"
|
||||
|
||||
"github.com/docker/containerd"
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/docker/containerd/supervisor"
|
||||
"github.com/containerd/containerd"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
"github.com/containerd/containerd/supervisor"
|
||||
"github.com/golang/protobuf/ptypes"
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
|
|
@ -3,9 +3,9 @@ package server
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/docker/containerd/specs"
|
||||
"github.com/docker/containerd/supervisor"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/specs"
|
||||
"github.com/containerd/containerd/supervisor"
|
||||
"github.com/opencontainers/runc/libcontainer/system"
|
||||
ocs "github.com/opencontainers/runtime-spec/specs-go"
|
||||
"golang.org/x/net/context"
|
||||
|
|
|
@ -3,9 +3,9 @@ package server
|
|||
import (
|
||||
"fmt"
|
||||
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/docker/containerd/specs"
|
||||
"github.com/docker/containerd/supervisor"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/specs"
|
||||
"github.com/containerd/containerd/supervisor"
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@ import (
|
|||
"runtime"
|
||||
"syscall"
|
||||
|
||||
"github.com/docker/containerd/osutils"
|
||||
"github.com/containerd/containerd/osutils"
|
||||
"github.com/docker/docker/pkg/term"
|
||||
)
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ import (
|
|||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/docker/containerd/specs"
|
||||
"github.com/containerd/containerd/specs"
|
||||
)
|
||||
|
||||
var errRuntime = errors.New("shim: runtime execution error")
|
||||
|
|
|
@ -19,11 +19,11 @@ import (
|
|||
"github.com/Sirupsen/logrus"
|
||||
"github.com/codegangsta/cli"
|
||||
"github.com/cyberdelia/go-metrics-graphite"
|
||||
"github.com/docker/containerd"
|
||||
grpcserver "github.com/docker/containerd/api/grpc/server"
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/docker/containerd/api/http/pprof"
|
||||
"github.com/docker/containerd/supervisor"
|
||||
"github.com/containerd/containerd"
|
||||
grpcserver "github.com/containerd/containerd/api/grpc/server"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/api/http/pprof"
|
||||
"github.com/containerd/containerd/supervisor"
|
||||
"github.com/docker/docker/pkg/listeners"
|
||||
"github.com/rcrowley/go-metrics"
|
||||
)
|
||||
|
|
|
@ -7,7 +7,7 @@ import (
|
|||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/cloudfoundry/gosigar"
|
||||
"github.com/docker/containerd/osutils"
|
||||
"github.com/containerd/containerd/osutils"
|
||||
"github.com/rcrowley/go-metrics"
|
||||
)
|
||||
|
||||
|
|
|
@ -6,7 +6,7 @@ import (
|
|||
"text/tabwriter"
|
||||
|
||||
"github.com/codegangsta/cli"
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
netcontext "golang.org/x/net/context"
|
||||
)
|
||||
|
||||
|
|
|
@ -17,8 +17,8 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/codegangsta/cli"
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/docker/containerd/specs"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/specs"
|
||||
"github.com/docker/docker/pkg/term"
|
||||
"github.com/golang/protobuf/ptypes"
|
||||
netcontext "golang.org/x/net/context"
|
||||
|
|
|
@ -7,7 +7,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/codegangsta/cli"
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
"github.com/golang/protobuf/ptypes"
|
||||
netcontext "golang.org/x/net/context"
|
||||
)
|
||||
|
|
|
@ -9,8 +9,8 @@ import (
|
|||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/codegangsta/cli"
|
||||
"github.com/docker/containerd"
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
)
|
||||
|
||||
const usage = `High performance container daemon cli`
|
||||
|
|
|
@ -3,7 +3,7 @@ package main
|
|||
import (
|
||||
"sort"
|
||||
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
)
|
||||
|
||||
func sortContainers(c []*types.Container) {
|
||||
|
|
|
@ -2,5 +2,5 @@
|
|||
|
||||
The API for containerd is with GRPC over a unix socket located at the default location of `/run/containerd/containerd.sock`.
|
||||
|
||||
At this time please refer to the [proto at](https://github.com/docker/containerd/blob/master/api/grpc/types/api.proto) for the API methods and types.
|
||||
At this time please refer to the [proto at](https://github.com/containerd/containerd/blob/master/api/grpc/types/api.proto) for the API methods and types.
|
||||
There is a Go implementation and types checked into this repository but alternate language implementations can be created using the grpc and protoc toolchain.
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
PROJECT=github.com/docker/containerd
|
||||
PROJECT=github.com/containerd/containerd
|
||||
|
||||
# Downloads dependencies into vendor/ directory
|
||||
mkdir -p vendor
|
||||
|
|
|
@ -11,7 +11,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
netcontext "golang.org/x/net/context"
|
||||
"google.golang.org/grpc"
|
||||
)
|
||||
|
|
|
@ -9,7 +9,7 @@ import (
|
|||
"reflect"
|
||||
"runtime"
|
||||
|
||||
utils "github.com/docker/containerd/testutils"
|
||||
utils "github.com/containerd/containerd/testutils"
|
||||
ocs "github.com/opencontainers/runtime-spec/specs-go"
|
||||
)
|
||||
|
||||
|
|
|
@ -19,8 +19,8 @@ import (
|
|||
"google.golang.org/grpc/grpclog"
|
||||
"google.golang.org/grpc/health/grpc_health_v1"
|
||||
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
utils "github.com/docker/containerd/testutils"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
utils "github.com/containerd/containerd/testutils"
|
||||
"github.com/go-check/check"
|
||||
"github.com/golang/protobuf/ptypes/timestamp"
|
||||
)
|
||||
|
|
|
@ -11,7 +11,7 @@ import (
|
|||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
"github.com/golang/protobuf/ptypes"
|
||||
"github.com/golang/protobuf/ptypes/timestamp"
|
||||
"golang.org/x/net/context"
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"fmt"
|
||||
"time"
|
||||
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
"github.com/docker/docker/pkg/integration/checker"
|
||||
"github.com/go-check/check"
|
||||
)
|
||||
|
|
|
@ -7,7 +7,7 @@ import (
|
|||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
"github.com/docker/docker/pkg/integration/checker"
|
||||
"github.com/go-check/check"
|
||||
)
|
||||
|
|
|
@ -8,7 +8,7 @@ import (
|
|||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
"github.com/docker/docker/pkg/integration/checker"
|
||||
"github.com/go-check/check"
|
||||
ocs "github.com/opencontainers/runtime-spec/specs-go"
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
"syscall"
|
||||
"time"
|
||||
|
||||
"github.com/docker/containerd/api/grpc/types"
|
||||
"github.com/containerd/containerd/api/grpc/types"
|
||||
"github.com/docker/docker/pkg/integration/checker"
|
||||
"github.com/go-check/check"
|
||||
"google.golang.org/grpc"
|
||||
|
|
|
@ -13,7 +13,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/docker/containerd/specs"
|
||||
"github.com/containerd/containerd/specs"
|
||||
ocs "github.com/opencontainers/runtime-spec/specs-go"
|
||||
"golang.org/x/net/context"
|
||||
"golang.org/x/sys/unix"
|
||||
|
|
|
@ -11,7 +11,7 @@ import (
|
|||
"strings"
|
||||
"syscall"
|
||||
|
||||
"github.com/docker/containerd/specs"
|
||||
"github.com/containerd/containerd/specs"
|
||||
ocs "github.com/opencontainers/runtime-spec/specs-go"
|
||||
)
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@ import (
|
|||
"os/exec"
|
||||
"strings"
|
||||
|
||||
"github.com/docker/containerd/specs"
|
||||
"github.com/containerd/containerd/specs"
|
||||
ocs "github.com/opencontainers/runtime-spec/specs-go"
|
||||
)
|
||||
|
||||
|
|
|
@ -15,7 +15,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/docker/containerd/specs"
|
||||
"github.com/containerd/containerd/specs"
|
||||
"golang.org/x/sys/unix"
|
||||
)
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"errors"
|
||||
"time"
|
||||
|
||||
"github.com/docker/containerd/specs"
|
||||
"github.com/containerd/containerd/specs"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -12,7 +12,7 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
utils "github.com/docker/containerd/testutils"
|
||||
utils "github.com/containerd/containerd/testutils"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -4,8 +4,8 @@ import (
|
|||
"os"
|
||||
"time"
|
||||
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/docker/containerd/specs"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
"github.com/containerd/containerd/specs"
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
|
|
|
@ -2,7 +2,7 @@
|
|||
|
||||
package supervisor
|
||||
|
||||
import "github.com/docker/containerd/runtime"
|
||||
import "github.com/containerd/containerd/runtime"
|
||||
|
||||
// CreateCheckpointTask holds needed parameters to create a new checkpoint
|
||||
type CreateCheckpointTask struct {
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"path/filepath"
|
||||
"time"
|
||||
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
)
|
||||
|
||||
// DeleteTask holds needed parameters to remove a container
|
||||
|
|
|
@ -4,7 +4,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
)
|
||||
|
||||
// ExitTask holds needed parameters to execute the exit task
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
package supervisor
|
||||
|
||||
import "github.com/docker/containerd/runtime"
|
||||
import "github.com/containerd/containerd/runtime"
|
||||
|
||||
// GetContainersTask holds needed parameters to retrieve a list of
|
||||
// containers
|
||||
|
|
|
@ -5,8 +5,8 @@ import (
|
|||
"syscall"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/docker/containerd/archutils"
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/containerd/containerd/archutils"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
)
|
||||
|
||||
// NewMonitor starts a new process monitor and returns it
|
||||
|
|
|
@ -38,7 +38,7 @@ import (
|
|||
"unsafe"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
)
|
||||
|
||||
// NewMonitor starts a new process monitor and returns it
|
||||
|
|
|
@ -3,7 +3,7 @@ package supervisor
|
|||
import (
|
||||
"sort"
|
||||
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
)
|
||||
|
||||
func sortProcesses(p []runtime.Process) {
|
||||
|
|
|
@ -6,8 +6,8 @@ import (
|
|||
"sort"
|
||||
"testing"
|
||||
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/docker/containerd/specs"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
"github.com/containerd/containerd/specs"
|
||||
)
|
||||
|
||||
var (
|
||||
|
|
|
@ -3,7 +3,7 @@ package supervisor
|
|||
import (
|
||||
"time"
|
||||
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
)
|
||||
|
||||
// StatsTask holds needed parameters to retrieve a container statistics
|
||||
|
|
|
@ -10,7 +10,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
)
|
||||
|
||||
const (
|
||||
|
|
|
@ -8,7 +8,7 @@ import (
|
|||
"testing"
|
||||
"time"
|
||||
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
)
|
||||
|
||||
func TestEventLogCompat(t *testing.T) {
|
||||
|
|
|
@ -3,7 +3,7 @@ package supervisor
|
|||
import (
|
||||
"sync"
|
||||
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
)
|
||||
|
||||
// StartResponse is the response containing a started container
|
||||
|
|
|
@ -3,7 +3,7 @@ package supervisor
|
|||
import (
|
||||
"time"
|
||||
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
)
|
||||
|
||||
// UpdateTask holds needed parameters to update a container resource constraints
|
||||
|
|
|
@ -5,7 +5,7 @@ import (
|
|||
"time"
|
||||
|
||||
"github.com/Sirupsen/logrus"
|
||||
"github.com/docker/containerd/runtime"
|
||||
"github.com/containerd/containerd/runtime"
|
||||
"golang.org/x/net/context"
|
||||
)
|
||||
|
||||
|
|
Loading…
Reference in New Issue