From ea34e1ad22102112e31ca6020452096c5d56e712 Mon Sep 17 00:00:00 2001 From: Paul Tagliamonte Date: Tue, 12 Jul 2016 15:46:35 +0100 Subject: [PATCH] opencontainer-specs-0.5.0 Gbp-Pq: Name opencontainer-specs-0.5.0.patch --- daemon/container_operations_unix.go | 2 +- daemon/daemon_unix.go | 2 +- daemon/oci_linux.go | 2 +- daemon/seccomp_disabled.go | 2 +- daemon/seccomp_linux.go | 2 +- libcontainerd/client_linux.go | 2 +- libcontainerd/container_linux.go | 2 +- libcontainerd/types_linux.go | 2 +- libcontainerd/utils_linux.go | 2 +- oci/defaults_linux.go | 2 +- profiles/seccomp/seccomp.go | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go index a313ef5c..5a1a9a3f 100644 --- 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 bcb7f505..e791ed41 100644 --- 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 0c3636ce..dd4571c8 100644 --- 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 620eee29..eb107d23 100644 --- 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 659a15de..f94583c5 100644 --- 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 8eab7512..c90c5c57 100644 --- 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 8a49cde2..69e252b0 100644 --- 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 bee12d91..a8c78ce7 100644 --- 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 5b67244f..1c1ced04 100644 --- 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 9ee75461..2fd746f0 100644 --- 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 0718d840..646ecc76 100644 --- 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 -- 2.30.2