opencontainer-specs-0.5.0

Gbp-Pq: Name opencontainer-specs-0.5.0.patch

diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go
index a313ef5ccff7ff7e39337daf4cca004723eb0c84..5a1a9a3f7d61e9855acdaaea36745a1be94bab16 100644 (file)
--- a/daemon/container_operations_unix.go
+++ b/daemon/container_operations_unix.go
@@ -25,7 +25,7 @@ import (
        "github.com/opencontainers/runc/libcontainer/configs"
        "github.com/opencontainers/runc/libcontainer/devices"
        "github.com/opencontainers/runc/libcontainer/label"
-       "github.com/opencontainers/specs/specs-go"
+       "github.com/opencontainers/runtime-spec/specs-go"
 )
 
 func u32Ptr(i int64) *uint32     { u := uint32(i); return &u }

diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go
index bcb7f505b574406af469bfbcc9477ff74c4e2f92..e791ed417c48d4fea364c7be1fea49f6dc4033dd 100644 (file)
--- a/daemon/daemon_unix.go
+++ b/daemon/daemon_unix.go
@@ -38,7 +38,7 @@ import (
        lntypes "github.com/docker/libnetwork/types"
        "github.com/opencontainers/runc/libcontainer/label"
        "github.com/opencontainers/runc/libcontainer/user"
-       "github.com/opencontainers/specs/specs-go"
+       "github.com/opencontainers/runtime-spec/specs-go"
 )
 
 const (

diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go
index 0c3636ce1d47f2ba14e1f81d20b986fe6230985a..dd4571c894014fa71e4d2b2fb2aedea3c417f445 100644 (file)
--- a/daemon/oci_linux.go
+++ b/daemon/oci_linux.go
@@ -22,7 +22,7 @@ import (
        "github.com/opencontainers/runc/libcontainer/apparmor"
        "github.com/opencontainers/runc/libcontainer/devices"
        "github.com/opencontainers/runc/libcontainer/user"
-       "github.com/opencontainers/specs/specs-go"
+       "github.com/opencontainers/runtime-spec/specs-go"
 )
 
 func setResources(s *specs.Spec, r containertypes.Resources) error {

diff --git a/daemon/seccomp_disabled.go b/daemon/seccomp_disabled.go
index 620eee29bf671718da94a2da99a07e06a1fd2e34..eb107d236e0b53cf4ed83b912e9baf5349c9d174 100644 (file)
--- a/daemon/seccomp_disabled.go
+++ b/daemon/seccomp_disabled.go
@@ -4,7 +4,7 @@ package daemon
 
 import (
        "github.com/docker/docker/container"
-       "github.com/opencontainers/specs/specs-go"
+       "github.com/opencontainers/runtime-spec/specs-go"
 )
 
 func setSeccomp(daemon *Daemon, rs *specs.Spec, c *container.Container) error {

diff --git a/daemon/seccomp_linux.go b/daemon/seccomp_linux.go
index 659a15decd88aa1e1d77ce4e88969b2728069921..f94583c504885f15a7beaa61b6213f17962e9bad 100644 (file)
--- a/daemon/seccomp_linux.go
+++ b/daemon/seccomp_linux.go
@@ -8,7 +8,7 @@ import (
        "github.com/Sirupsen/logrus"
        "github.com/docker/docker/container"
        "github.com/docker/docker/profiles/seccomp"
-       "github.com/opencontainers/specs/specs-go"
+       "github.com/opencontainers/runtime-spec/specs-go"
 )
 
 func setSeccomp(daemon *Daemon, rs *specs.Spec, c *container.Container) error {

diff --git a/libcontainerd/client_linux.go b/libcontainerd/client_linux.go
index 8eab75126549df9efb1fd2f830d566622508d0e6..c90c5c574e15a85fab480d585e8246cc891a9bb5 100644 (file)
--- a/libcontainerd/client_linux.go
+++ b/libcontainerd/client_linux.go
@@ -13,7 +13,7 @@ import (
        containerd "github.com/docker/containerd/api/grpc/types"
        "github.com/docker/docker/pkg/idtools"
        "github.com/docker/docker/pkg/mount"
-       "github.com/opencontainers/specs/specs-go"
+       "github.com/opencontainers/runtime-spec/specs-go"
        "golang.org/x/net/context"
 )
 

diff --git a/libcontainerd/container_linux.go b/libcontainerd/container_linux.go
index 8a49cde2fa8a6674d688297fe0fca5cf6e8fffe4..69e252b0b50cf4ebd025c3fbee3dc4d871c27a3c 100644 (file)
--- a/libcontainerd/container_linux.go
+++ b/libcontainerd/container_linux.go
@@ -12,7 +12,7 @@ import (
        "github.com/Sirupsen/logrus"
        containerd "github.com/docker/containerd/api/grpc/types"
        "github.com/docker/docker/restartmanager"
-       "github.com/opencontainers/specs/specs-go"
+       "github.com/opencontainers/runtime-spec/specs-go"
        "golang.org/x/net/context"
 )
 

diff --git a/libcontainerd/types_linux.go b/libcontainerd/types_linux.go
index bee12d91227b9cf178ce7eeba498c229f17495dc..a8c78ce787ca740d687427e626693f24456e56a4 100644 (file)
--- a/libcontainerd/types_linux.go
+++ b/libcontainerd/types_linux.go
@@ -2,7 +2,7 @@ package libcontainerd
 
 import (
        containerd "github.com/docker/containerd/api/grpc/types"
-       "github.com/opencontainers/specs/specs-go"
+       "github.com/opencontainers/runtime-spec/specs-go"
 )
 
 // Spec is the base configuration for the container.  It specifies platform

diff --git a/libcontainerd/utils_linux.go b/libcontainerd/utils_linux.go
index 5b67244f0cc99093d7af41735c7791a030b14a88..1c1ced04addfc530517e4d47c3a5efa926be75c7 100644 (file)
--- a/libcontainerd/utils_linux.go
+++ b/libcontainerd/utils_linux.go
@@ -2,7 +2,7 @@ package libcontainerd
 
 import (
        containerd "github.com/docker/containerd/api/grpc/types"
-       "github.com/opencontainers/specs/specs-go"
+       "github.com/opencontainers/runtime-spec/specs-go"
 )
 
 func getRootIDs(s specs.Spec) (int, int, error) {

diff --git a/oci/defaults_linux.go b/oci/defaults_linux.go
index 9ee7546193fc1b1b45f3cafe6b761621a63b2cc4..2fd746f02e2b4d1d5210897623a49ac148db9a3a 100644 (file)
--- a/oci/defaults_linux.go
+++ b/oci/defaults_linux.go
@@ -4,7 +4,7 @@ import (
        "os"
        "runtime"
 
-       "github.com/opencontainers/specs/specs-go"
+       "github.com/opencontainers/runtime-spec/specs-go"
 )
 
 func sPtr(s string) *string      { return &s }

diff --git a/profiles/seccomp/seccomp.go b/profiles/seccomp/seccomp.go
index 0718d8401e210b5b46ec9e6fe7da334ca295f5e0..646ecc7653b310622ce6f1ecdfee0bd24a4d2f9e 100644 (file)
--- a/profiles/seccomp/seccomp.go
+++ b/profiles/seccomp/seccomp.go
@@ -7,7 +7,7 @@ import (
        "fmt"
 
        "github.com/docker/engine-api/types"
-       "github.com/opencontainers/specs/specs-go"
+       "github.com/opencontainers/runtime-spec/specs-go"
 )
 
 //go:generate go run -tags 'seccomp' generate.go