kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Replace old oci specs import with runtime-specs

Browse source 
Fixes #25804

The upstream repo changed the import paths.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
This commit is contained in:
Michael Crosby 2016-08-17 09:38:34 -07:00
parent 2ae49a0887
commit 041e5a21dc
23 changed files with 19 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
daemon/container_operations_unix.go
View file

@ -25,7 +25,7 @@ import (
"github.com/opencontainers/runc/libcontainer/configs" "github.com/opencontainers/runc/libcontainer/configs"
"github.com/opencontainers/runc/libcontainer/devices" "github.com/opencontainers/runc/libcontainer/devices"
"github.com/opencontainers/runc/libcontainer/label" "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 } func u32Ptr(i int64) *uint32 { u := uint32(i); return &u }

2
daemon/daemon_unix.go
View file

@ -38,7 +38,7 @@ import (
"github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes"
"github.com/opencontainers/runc/libcontainer/label" "github.com/opencontainers/runc/libcontainer/label"
"github.com/opencontainers/runc/libcontainer/user" "github.com/opencontainers/runc/libcontainer/user"
"github.com/opencontainers/specs/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
) )
const ( const (

2
daemon/oci_linux.go
View file

@ -23,7 +23,7 @@ import (
"github.com/opencontainers/runc/libcontainer/apparmor" "github.com/opencontainers/runc/libcontainer/apparmor"
"github.com/opencontainers/runc/libcontainer/devices" "github.com/opencontainers/runc/libcontainer/devices"
"github.com/opencontainers/runc/libcontainer/user" "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 { func setResources(s *specs.Spec, r containertypes.Resources) error {

2
daemon/seccomp_disabled.go
View file

@ -6,7 +6,7 @@ import (
"fmt" "fmt"
"github.com/docker/docker/container" "github.com/docker/docker/container"
"github.com/opencontainers/specs/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
) )
var supportsSeccomp = false var supportsSeccomp = false

2
daemon/seccomp_linux.go
View file

@ -8,7 +8,7 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
"github.com/docker/docker/container" "github.com/docker/docker/container"
"github.com/docker/docker/profiles/seccomp" "github.com/docker/docker/profiles/seccomp"
"github.com/opencontainers/specs/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
) )
var supportsSeccomp = true var supportsSeccomp = true

2
docs/reference/commandline/dockerd.md
View file

@ -590,7 +590,7 @@ options for `zfs` start with `zfs` and options for `btrfs` start with `btrfs`.
## Docker runtime execution options ## Docker runtime execution options
The Docker daemon relies on a 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 (invoked via the `containerd` daemon) as its interface to the Linux
kernel `namespaces`, `cgroups`, and `SELinux`. kernel `namespaces`, `cgroups`, and `SELinux`.

2
hack/vendor.sh
View file

@ -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/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c
clone git github.com/opencontainers/runc cc29e3dded8e27ba8f65738f40d251c885030a28 # libcontainer 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 clone git github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
# libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json) # libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
clone git github.com/coreos/go-systemd v4 clone git github.com/coreos/go-systemd v4

2
libcontainerd/client_linux.go
View file

@ -16,7 +16,7 @@ import (
"github.com/docker/docker/pkg/mount" "github.com/docker/docker/pkg/mount"
"github.com/golang/protobuf/ptypes" "github.com/golang/protobuf/ptypes"
"github.com/golang/protobuf/ptypes/timestamp" "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" "golang.org/x/net/context"
) )

2
libcontainerd/container_linux.go
View file

@ -12,7 +12,7 @@ import (
"github.com/Sirupsen/logrus" "github.com/Sirupsen/logrus"
containerd "github.com/docker/containerd/api/grpc/types" containerd "github.com/docker/containerd/api/grpc/types"
"github.com/docker/docker/restartmanager" "github.com/docker/docker/restartmanager"
"github.com/opencontainers/specs/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
"golang.org/x/net/context" "golang.org/x/net/context"
) )

2
libcontainerd/types_linux.go
View file

@ -2,7 +2,7 @@ package libcontainerd
import ( import (
containerd "github.com/docker/containerd/api/grpc/types" 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 // Spec is the base configuration for the container. It specifies platform

2
libcontainerd/types_solaris.go
View file

@ -1,7 +1,7 @@
package libcontainerd package libcontainerd
import ( 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 // Spec is the base configuration for the container. It specifies platform

2
libcontainerd/utils_linux.go
View file

@ -2,7 +2,7 @@ package libcontainerd
import ( import (
containerd "github.com/docker/containerd/api/grpc/types" 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) { func getRootIDs(s specs.Spec) (int, int, error) {

2
oci/defaults_linux.go
View file

@ -4,7 +4,7 @@ import (
"os" "os"
"runtime" "runtime"
"github.com/opencontainers/specs/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
) )
func sPtr(s string) *string { return &s } func sPtr(s string) *string { return &s }

2
oci/defaults_solaris.go
View file

@ -1,7 +1,7 @@
package oci package oci
import ( import (
"github.com/opencontainers/specs/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
) )
// DefaultSpec returns default oci spec used by docker. // DefaultSpec returns default oci spec used by docker.

2
plugin/manager_linux.go
View file

@ -17,7 +17,7 @@ import (
"github.com/docker/docker/restartmanager" "github.com/docker/docker/restartmanager"
"github.com/docker/engine-api/types" "github.com/docker/engine-api/types"
"github.com/docker/engine-api/types/container" "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 { func (pm *Manager) enable(p *plugin, force bool) error {

2
plugin/manager_windows.go
View file

@ -5,7 +5,7 @@ package plugin
import ( import (
"fmt" "fmt"
"github.com/opencontainers/specs/specs-go" "github.com/opencontainers/runtime-spec/specs-go"
) )
func (pm *Manager) enable(p *plugin, force bool) error { func (pm *Manager) enable(p *plugin, force bool) error {

2
profiles/seccomp/seccomp.go
View file

@ -7,7 +7,7 @@ import (
"fmt" "fmt"
"github.com/docker/engine-api/types" "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 //go:generate go run -tags 'seccomp' generate.go

2
profiles/seccomp/seccomp_default.go
View file

@ -6,7 +6,7 @@ import (
"syscall" "syscall"
"github.com/docker/engine-api/types" "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" libseccomp "github.com/seccomp/libseccomp-golang"
) )

2
profiles/seccomp/seccomp_unsupported.go
View file

@ -4,7 +4,7 @@ package seccomp
import ( import (
"github.com/docker/engine-api/types" "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. // DefaultProfile returns a nil pointer on unsupported systems.

0
vendor/src/github.com/opencontainers/specs/LICENSE → vendor/src/github.com/opencontainers/runtime-spec/LICENSE vendored
View file

0
vendor/src/github.com/opencontainers/specs/specs-go/config.go → vendor/src/github.com/opencontainers/runtime-spec/specs-go/config.go vendored
View file

0
vendor/src/github.com/opencontainers/specs/specs-go/state.go → vendor/src/github.com/opencontainers/runtime-spec/specs-go/state.go vendored
View file

0
vendor/src/github.com/opencontainers/specs/specs-go/version.go → vendor/src/github.com/opencontainers/runtime-spec/specs-go/version.go vendored
View file