Merge pull request #1281 from mlaventure/update-runtime-spec-1.0

Update runtime-spec to v1.0.0

.travis.yml

@@ -17,7 +17,7 @@ addons:
       - curl
 
 env:
-  - SECCOMP_VERSION=2.3.1 RUNC_COMMIT=992a5be178a62e026f4069f443c6164912adbf09
+  - SECCOMP_VERSION=2.3.1 RUNC_COMMIT=9a01140955fba11a1c2927a9b273e9c837e3e30a
 
 
 install:

api/grpc/server/server_linux.go

@@ -36,7 +36,7 @@ func (s *apiServer) AddProcess(ctx context.Context, r *types.AddProcessRequest)
 	process.SelinuxLabel = r.SelinuxLabel
 	process.NoNewPrivileges = r.NoNewPrivileges
 	for _, rl := range r.Rlimits {
-		process.Rlimits = append(process.Rlimits, ocs.LinuxRlimit{
+		process.Rlimits = append(process.Rlimits, ocs.POSIXRlimit{
 			Type: rl.Type,
 			Soft: rl.Soft,
 			Hard: rl.Hard,

integration-test/events_test.go

@@ -5,7 +5,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/api/grpc/types"
-	"github.com/docker/docker/pkg/integration/checker"
+	"github.com/docker/docker/integration-cli/checker"
 	"github.com/go-check/check"
 )
 

integration-test/exec_test.go

@@ -10,7 +10,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/api/grpc/types"
-	"github.com/docker/docker/pkg/integration/checker"
+	"github.com/docker/docker/integration-cli/checker"
 	"github.com/go-check/check"
 )
 

integration-test/restore_test.go

@@ -8,7 +8,7 @@ import (
 
 	"github.com/containerd/containerd/api/grpc/types"
 	"github.com/containerd/containerd/runtime"
-	"github.com/docker/docker/pkg/integration/checker"
+	"github.com/docker/docker/integration-cli/checker"
 	"github.com/go-check/check"
 )
 

integration-test/start_linux_test.go

@@ -9,7 +9,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/api/grpc/types"
-	"github.com/docker/docker/pkg/integration/checker"
+	"github.com/docker/docker/integration-cli/checker"
 	"github.com/go-check/check"
 	ocs "github.com/opencontainers/runtime-spec/specs-go"
 	"google.golang.org/grpc"
@@ -324,7 +324,7 @@ func (cs *ContainerdSuite) TestOOM(t *check.C) {
 	bundleName := "busybox-sh-512k-memlimit"
 	if err := CreateBundleWithFilter("busybox", bundleName, []string{"sh", "-c", "x=oom-party-time; while true; do x=$x$x$x$x$x$x$x$x$x$x; done"}, func(spec *ocs.Spec) {
 		// Limit to 512k for quick oom
-		var limit uint64 = 8 * 1024 * 1024
+		var limit int64 = 8 * 1024 * 1024
 		spec.Linux.Resources.Memory = &ocs.LinuxMemory{
 			Limit: &limit,
 		}

integration-test/start_solaris_test.go

@@ -6,7 +6,7 @@ import (
 	"time"
 
 	"github.com/containerd/containerd/api/grpc/types"
-	"github.com/docker/docker/pkg/integration/checker"
+	"github.com/docker/docker/integration-cli/checker"
 	"github.com/go-check/check"
 	"google.golang.org/grpc"
 )

runtime/container_linux.go

@@ -112,11 +112,11 @@ func i64Ptr(i int64) *int64   { return &i }
 func (c *container) UpdateResources(r *Resource) error {
 	sr := ocs.LinuxResources{
 		Memory: &ocs.LinuxMemory{
-			Limit:       u64Ptr(uint64(r.Memory)),
-			Reservation: u64Ptr(uint64(r.MemoryReservation)),
-			Swap:        u64Ptr(uint64(r.MemorySwap)),
-			Kernel:      u64Ptr(uint64(r.KernelMemory)),
-			KernelTCP:   u64Ptr(uint64(r.KernelTCPMemory)),
+			Limit:       i64Ptr(r.Memory),
+			Reservation: i64Ptr(r.MemoryReservation),
+			Swap:        i64Ptr(r.MemorySwap),
+			Kernel:      i64Ptr(r.KernelMemory),
+			KernelTCP:   i64Ptr(r.KernelTCPMemory),
 		},
 		CPU: &ocs.LinuxCPU{
 			Shares:          u64Ptr(uint64(r.CPUShares)),

specs/spec_linux.go

@@ -8,5 +8,5 @@ type (
 	// Spec aliases the platform oci spec
 	Spec oci.Spec
 	// Rlimit aliases the platform resource limit
-	Rlimit oci.LinuxRlimit
+	Rlimit oci.POSIXRlimit
 )

vendor.conf

@@ -3,20 +3,20 @@ github.com/cloudfoundry/gosigar 3ed7c74352dae6dc00bdc8c74045375352e3ec05
 github.com/urfave/cli 8ba6f23b6e36d03666a14bd9421f5e3efcb59aca
 github.com/coreos/go-systemd 7b2428fec40033549c68f54e26e89e7ca9a9ce31
 github.com/cyberdelia/go-metrics-graphite 7e54b5c2aa6eaff4286c44129c3def899dff528c
-github.com/docker/docker 2f6e3b0ba027b558adabd41344fee59db4441011
+github.com/docker/docker f577caff19d486d8d01443507d891cb1b0891cdc
 github.com/docker/go-units 5d2041e26a699eaca682e2ea41c8f891e1060444
 github.com/godbus/dbus e2cf28118e66a6a63db46cf6088a35d2054d3bb0
 github.com/golang/glog 23def4e6c14b4da8ac2ed8007337bc5eb5007998
 github.com/golang/protobuf 8ee79997227bf9b34611aee7946ae64735e6fd93
-github.com/opencontainers/runc 992a5be178a62e026f4069f443c6164912adbf09
-github.com/opencontainers/runtime-spec aaa24815e0ab632c424e18d726fd47f403ce2981
+github.com/opencontainers/runc 9a01140955fba11a1c2927a9b273e9c837e3e30a
+github.com/opencontainers/runtime-spec v1.0.0
 github.com/rcrowley/go-metrics eeba7bd0dd01ace6e690fa833b3f22aaec29af43
 github.com/satori/go.uuid f9ab0dce87d815821e221626b772e3475a0d2749
 github.com/syndtr/gocapability 2c00daeb6c3b45114c80ac44119e7b8801fdd852
 github.com/vishvananda/netlink adb0f53af689dd38f1443eba79489feaacf0b22e
 github.com/Azure/go-ansiterm 70b2c90b260171e829f1ebd7c17f600c11858dbe
 golang.org/x/net 991d3e32f76f19ee6d9caadb3a22eae8d23315f7 https://github.com/golang/net.git
-golang.org/x/sys d4feaf1a7e61e1d9e79e6c4e76c6349e9cab0a03 https://github.com/golang/sys.git
+golang.org/x/sys 0e0164865330d5cf1c00247be08330bf96e2f87c https://github.com/golang/sys
 google.golang.org/grpc v1.0.4 https://github.com/grpc/grpc-go.git
 github.com/seccomp/libseccomp-golang 1b506fc7c24eec5a3693cdcbed40d9c226cfc6a1
 github.com/tonistiigi/fifo b45391ebcd3d282404092c04a2b015b37df12383
@@ -29,5 +29,5 @@ github.com/containerd/console a3863895279f5104533fd999c1babf80faffd98c
 github.com/containerd/go-runc 5fe4d8cb7fdc0fae5f5a7f4f1d65a565032401b2
 
 # dependencies of docker/pkg/listeners
-github.com/docker/go-connections v0.2.0
+github.com/docker/go-connections 3ede32e2033de7505e6500d6c868c2b9ed9f169d
 github.com/Microsoft/go-winio v0.3.2