Merge pull request #78 from Random-Liu/switch-to-new-containerd-client

Switch to new containerd api
containerd · Jun 16, 2017 · cc43c86 · cc43c86
2 parents d4f7380 + d643599
commit cc43c86
Show file tree

Hide file tree

Showing 225 changed files with 41,793 additions and 7,227 deletions.
diff --git a/Godeps/Godeps.json b/Godeps/Godeps.json
diff --git a/pkg/metadata/sandbox.go b/pkg/metadata/sandbox.go
@@ -56,6 +56,8 @@ type SandboxMetadata struct {
 	CreatedAt int64
 	// NetNS is the network namespace used by the sandbox.
 	NetNS string
+	// Pid is the process id of the sandbox.
+	Pid uint32
 }
 
 // SandboxUpdateFunc is the function used to update SandboxMetadata.

diff --git a/pkg/metadata/sandbox_test.go b/pkg/metadata/sandbox_test.go
@@ -42,6 +42,7 @@ func TestSandboxStore(t *testing.T) {
 			},
 			CreatedAt: time.Now().UnixNano(),
 			NetNS:     "TestNetNS-1",
+			Pid:       1001,
 		},
 		"2": {
 			ID:   "2",
@@ -56,6 +57,7 @@ func TestSandboxStore(t *testing.T) {
 			},
 			CreatedAt: time.Now().UnixNano(),
 			NetNS:     "TestNetNS-2",
+			Pid:       1002,
 		},
 		"3": {
 			ID:   "3",
@@ -70,6 +72,7 @@ func TestSandboxStore(t *testing.T) {
 			},
 			CreatedAt: time.Now().UnixNano(),
 			NetNS:     "TestNetNS-3",
+			Pid:       1003,
 		},
 	}
 	assert := assertlib.New(t)

diff --git a/pkg/os/os.go b/pkg/os/os.go
@@ -21,7 +21,7 @@ import (
 	"io/ioutil"
 	"os"
 
-	"github.com/tonistiigi/fifo"
+	"github.com/containerd/fifo"
 	"golang.org/x/net/context"
 	"golang.org/x/sys/unix"
 )