diff --git a/daemon/container_operations_unix.go b/daemon/container_operations_unix.go index d2b849445e6c36b8dc24602e63d463b85dc2ce88..02497fa2a4b21e66c6cc851023ca64658ef11c66 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 d1a9f2320b0908a803c167af0564265c9ca2a8b7..9d5fba366e2d4b3f9325010a290beac001155c06 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -38,7 +38,7 @@ import ( "github.com/golang/protobuf/ptypes" "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 f9aa7d4ac17000b9dfef6f7edba9c1a657e42873..8e161af72cb6650c6d1dc39a8767581329d48717 100644 --- a/daemon/oci_linux.go +++ b/daemon/oci_linux.go @@ -23,7 +23,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 4ad1b7c53fb2766cbdb0f0dae13591029459bfa0..ff1127b6c20ac3a343b6a0bc0280151a3008511f 100644 --- a/daemon/seccomp_disabled.go +++ b/daemon/seccomp_disabled.go @@ -6,7 +6,7 @@ import ( "fmt" "github.com/docker/docker/container" - "github.com/opencontainers/specs/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) var supportsSeccomp = false diff --git a/daemon/seccomp_linux.go b/daemon/seccomp_linux.go index e9622787eedb97be67e7d2becf5658cb7f2d99d1..3581dc4ab54021d6f72ee1790c023634cd56367c 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" ) var supportsSeccomp = true diff --git a/docs/reference/commandline/dockerd.md b/docs/reference/commandline/dockerd.md index 6487371360e334b9e2faff52f2a742d4e1ec2bac..ccf120c3b967161d590cadac6e1c7aabb5a69814 100644 --- a/docs/reference/commandline/dockerd.md +++ b/docs/reference/commandline/dockerd.md @@ -590,7 +590,7 @@ options for `zfs` start with `zfs` and options for `btrfs` start with `btrfs`. ## Docker runtime execution options The Docker daemon relies on a -[OCI](https://github.com/opencontainers/specs) compliant runtime +[OCI](https://github.com/opencontainers/runtime-spec) compliant runtime (invoked via the `containerd` daemon) as its interface to the Linux kernel `namespaces`, `cgroups`, and `SELinux`. diff --git a/hack/vendor.sh b/hack/vendor.sh index 1251dfdf0633405c98e07d64cc40da7df9e182c5..9768528869c0b555e663277e9e4827400aa88871 100755 --- a/hack/vendor.sh +++ b/hack/vendor.sh @@ -103,7 +103,7 @@ clone git github.com/docker/go v1.5.1-1-1-gbaf439e clone git github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c clone git github.com/opencontainers/runc cc29e3dded8e27ba8f65738f40d251c885030a28 # libcontainer -clone git github.com/opencontainers/specs v1.0.0-rc1 # specs +clone git github.com/opencontainers/runtime-spec v1.0.0-rc1 # specs clone git github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0 # libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json) clone git github.com/coreos/go-systemd v4 diff --git a/libcontainerd/client_linux.go b/libcontainerd/client_linux.go index b9e7415f388203aa7372035f6b37947ddb0a5488..6b25f5bb43c90d2e859e83b1f6f6538e27509f9a 100644 --- a/libcontainerd/client_linux.go +++ b/libcontainerd/client_linux.go @@ -16,7 +16,7 @@ import ( "github.com/docker/docker/pkg/mount" "github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes/timestamp" - specs "github.com/opencontainers/specs/specs-go" + specs "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 454478b5c2a03606dc8268f2d69a9b4eae94f6ea..4ed9f659dc59cef07ce388d54f77380998040eef 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 4f714a2329563e524f8590cdf5fd66bbe09b0f5f..86a42d2c1f3359ef359b2b4178510cf072566739 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/types_solaris.go b/libcontainerd/types_solaris.go index 637e54300f6a0d1f3eeac283f71274d134d55aaf..f107ac0ebca8dd78c9954086fb752dd9a7c47ac9 100644 --- a/libcontainerd/types_solaris.go +++ b/libcontainerd/types_solaris.go @@ -1,7 +1,7 @@ package libcontainerd import ( - "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 --- 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 479620d346518c047cd469ada53e9265df6b52e7..8955467bf997bc57c38cc4701a2b02e0f8d0485a 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/oci/defaults_solaris.go b/oci/defaults_solaris.go index f3ed5c9c7701d430ea2fa26f60dfe0d082695a7f..24139585fae8bbd1ddf393811f4b05b8f40bf4d5 100644 --- a/oci/defaults_solaris.go +++ b/oci/defaults_solaris.go @@ -1,7 +1,7 @@ package oci import ( - "github.com/opencontainers/specs/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) // DefaultSpec returns default oci spec used by docker. diff --git a/plugin/manager_linux.go b/plugin/manager_linux.go index 18ca460a8069a0ea2d053b9919f594160e879ca8..b9ae328626089d0347b523891ba906d9b5607a6c 100644 --- a/plugin/manager_linux.go +++ b/plugin/manager_linux.go @@ -17,7 +17,7 @@ import ( "github.com/docker/docker/restartmanager" "github.com/docker/engine-api/types" "github.com/docker/engine-api/types/container" - "github.com/opencontainers/specs/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) func (pm *Manager) enable(p *plugin, force bool) error { diff --git a/plugin/manager_windows.go b/plugin/manager_windows.go index d423254e7431b1ef8007d0d04f14bc69b5312ae4..c242fb3bcdb235b8919d63981ea70e019b30d04f 100644 --- a/plugin/manager_windows.go +++ b/plugin/manager_windows.go @@ -5,7 +5,7 @@ package plugin import ( "fmt" - "github.com/opencontainers/specs/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) func (pm *Manager) enable(p *plugin, force bool) error { diff --git a/profiles/seccomp/seccomp.go b/profiles/seccomp/seccomp.go index 7a58e2c521b20dd94e12ad28142d657b805b283e..c965bbbcdc28a8cbf39906ca709677e9c1054ed2 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 diff --git a/profiles/seccomp/seccomp_default.go b/profiles/seccomp/seccomp_default.go index d23c7732e31cf4c008c0c5504cea427840826f91..f9061505c2f4fc9d811b373608aaa2dedfce260c 100644 --- a/profiles/seccomp/seccomp_default.go +++ b/profiles/seccomp/seccomp_default.go @@ -6,7 +6,7 @@ import ( "syscall" "github.com/docker/engine-api/types" - "github.com/opencontainers/specs/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" libseccomp "github.com/seccomp/libseccomp-golang" ) diff --git a/profiles/seccomp/seccomp_unsupported.go b/profiles/seccomp/seccomp_unsupported.go index ec7399cd018e5ab21e5f0d2386f19837777e104b..b3906f916fbdfaf0daa0c26d74cb39f0e083c9ff 100644 --- a/profiles/seccomp/seccomp_unsupported.go +++ b/profiles/seccomp/seccomp_unsupported.go @@ -4,7 +4,7 @@ package seccomp import ( "github.com/docker/engine-api/types" - "github.com/opencontainers/specs/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) // DefaultProfile returns a nil pointer on unsupported systems. diff --git a/vendor/src/github.com/opencontainers/specs/LICENSE b/vendor/src/github.com/opencontainers/runtime-spec/LICENSE similarity index 100% rename from vendor/src/github.com/opencontainers/specs/LICENSE rename to vendor/src/github.com/opencontainers/runtime-spec/LICENSE diff --git a/vendor/src/github.com/opencontainers/specs/specs-go/config.go b/vendor/src/github.com/opencontainers/runtime-spec/specs-go/config.go similarity index 100% rename from vendor/src/github.com/opencontainers/specs/specs-go/config.go rename to vendor/src/github.com/opencontainers/runtime-spec/specs-go/config.go diff --git a/vendor/src/github.com/opencontainers/specs/specs-go/state.go b/vendor/src/github.com/opencontainers/runtime-spec/specs-go/state.go similarity index 100% rename from vendor/src/github.com/opencontainers/specs/specs-go/state.go rename to vendor/src/github.com/opencontainers/runtime-spec/specs-go/state.go diff --git a/vendor/src/github.com/opencontainers/specs/specs-go/version.go b/vendor/src/github.com/opencontainers/runtime-spec/specs-go/version.go similarity index 100% rename from vendor/src/github.com/opencontainers/specs/specs-go/version.go rename to vendor/src/github.com/opencontainers/runtime-spec/specs-go/version.go