浏览代码

Replace old oci specs import with runtime-specs

Fixes #25804

The upstream repo changed the import paths.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Michael Crosby 9 年之前
父节点
当前提交
041e5a21dc

+ 1 - 1
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 }

+ 1 - 1
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 (

+ 1 - 1
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 {

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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`.
 

+ 1 - 1
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

+ 1 - 1
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"
 )
 

+ 1 - 1
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"
 )
 

+ 1 - 1
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

+ 1 - 1
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

+ 1 - 1
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) {

+ 1 - 1
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 }

+ 1 - 1
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.

+ 1 - 1
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 {

+ 1 - 1
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 {

+ 1 - 1
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

+ 1 - 1
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"
 )
 

+ 1 - 1
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.

+ 0 - 0
vendor/src/github.com/opencontainers/specs/LICENSE → vendor/src/github.com/opencontainers/runtime-spec/LICENSE


+ 0 - 0
vendor/src/github.com/opencontainers/specs/specs-go/config.go → vendor/src/github.com/opencontainers/runtime-spec/specs-go/config.go


+ 0 - 0
vendor/src/github.com/opencontainers/specs/specs-go/state.go → vendor/src/github.com/opencontainers/runtime-spec/specs-go/state.go


+ 0 - 0
vendor/src/github.com/opencontainers/specs/specs-go/version.go → vendor/src/github.com/opencontainers/runtime-spec/specs-go/version.go