Skip to content

Commit 041e5a2

Browse files
crosbymichaelcrosbymichael
committedAug 17, 2016
Replace old oci specs import with runtime-specs
Fixes moby#25804 The upstream repo changed the import paths. Signed-off-by: Michael Crosby <[email protected]>
·
v17.04.0-ce-rc1v1.13.0-rc1
1 parent 2ae49a0 commit 041e5a2

23 files changed

+19
-19
lines changed
 

‎daemon/container_operations_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ import (
2525
"github.com/opencontainers/runc/libcontainer/configs"
2626
"github.com/opencontainers/runc/libcontainer/devices"
2727
"github.com/opencontainers/runc/libcontainer/label"
28-
"github.com/opencontainers/specs/specs-go"
28+
"github.com/opencontainers/runtime-spec/specs-go"
2929
)
3030

3131
func u32Ptr(i int64) *uint32 { u := uint32(i); return &u }

‎daemon/daemon_unix.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
"github.com/golang/protobuf/ptypes"
3939
"github.com/opencontainers/runc/libcontainer/label"
4040
"github.com/opencontainers/runc/libcontainer/user"
41-
"github.com/opencontainers/specs/specs-go"
41+
"github.com/opencontainers/runtime-spec/specs-go"
4242
)
4343

4444
const (

‎daemon/oci_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ import (
2323
"github.com/opencontainers/runc/libcontainer/apparmor"
2424
"github.com/opencontainers/runc/libcontainer/devices"
2525
"github.com/opencontainers/runc/libcontainer/user"
26-
"github.com/opencontainers/specs/specs-go"
26+
"github.com/opencontainers/runtime-spec/specs-go"
2727
)
2828

2929
func setResources(s *specs.Spec, r containertypes.Resources) error {

‎daemon/seccomp_disabled.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"fmt"
77

88
"github.com/docker/docker/container"
9-
"github.com/opencontainers/specs/specs-go"
9+
"github.com/opencontainers/runtime-spec/specs-go"
1010
)
1111

1212
var supportsSeccomp = false

‎daemon/seccomp_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ import (
88
"github.com/Sirupsen/logrus"
99
"github.com/docker/docker/container"
1010
"github.com/docker/docker/profiles/seccomp"
11-
"github.com/opencontainers/specs/specs-go"
11+
"github.com/opencontainers/runtime-spec/specs-go"
1212
)
1313

1414
var supportsSeccomp = true

‎docs/reference/commandline/dockerd.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -590,7 +590,7 @@ options for `zfs` start with `zfs` and options for `btrfs` start with `btrfs`.
590590
## Docker runtime execution options
591591

592592
The Docker daemon relies on a
593-
[OCI](https://github.com/opencontainers/specs) compliant runtime
593+
[OCI](https://github.com/opencontainers/runtime-spec) compliant runtime
594594
(invoked via the `containerd` daemon) as its interface to the Linux
595595
kernel `namespaces`, `cgroups`, and `SELinux`.
596596

‎hack/vendor.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@ clone git github.com/docker/go v1.5.1-1-1-gbaf439e
103103
clone git github.com/agl/ed25519 d2b94fd789ea21d12fac1a4443dd3a3f79cda72c
104104

105105
clone git github.com/opencontainers/runc cc29e3dded8e27ba8f65738f40d251c885030a28 # libcontainer
106-
clone git github.com/opencontainers/specs v1.0.0-rc1 # specs
106+
clone git github.com/opencontainers/runtime-spec v1.0.0-rc1 # specs
107107
clone git github.com/seccomp/libseccomp-golang 32f571b70023028bd57d9288c20efbcb237f3ce0
108108
# libcontainer deps (see src/github.com/opencontainers/runc/Godeps/Godeps.json)
109109
clone git github.com/coreos/go-systemd v4

‎libcontainerd/client_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import (
1616
"github.com/docker/docker/pkg/mount"
1717
"github.com/golang/protobuf/ptypes"
1818
"github.com/golang/protobuf/ptypes/timestamp"
19-
specs "github.com/opencontainers/specs/specs-go"
19+
specs "github.com/opencontainers/runtime-spec/specs-go"
2020
"golang.org/x/net/context"
2121
)
2222

‎libcontainerd/container_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ import (
1212
"github.com/Sirupsen/logrus"
1313
containerd "github.com/docker/containerd/api/grpc/types"
1414
"github.com/docker/docker/restartmanager"
15-
"github.com/opencontainers/specs/specs-go"
15+
"github.com/opencontainers/runtime-spec/specs-go"
1616
"golang.org/x/net/context"
1717
)
1818

‎libcontainerd/types_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package libcontainerd
22

33
import (
44
containerd "github.com/docker/containerd/api/grpc/types"
5-
"github.com/opencontainers/specs/specs-go"
5+
"github.com/opencontainers/runtime-spec/specs-go"
66
)
77

88
// Spec is the base configuration for the container. It specifies platform

‎libcontainerd/types_solaris.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package libcontainerd
22

33
import (
4-
"github.com/opencontainers/specs/specs-go"
4+
"github.com/opencontainers/runtime-spec/specs-go"
55
)
66

77
// Spec is the base configuration for the container. It specifies platform

‎libcontainerd/utils_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ package libcontainerd
22

33
import (
44
containerd "github.com/docker/containerd/api/grpc/types"
5-
"github.com/opencontainers/specs/specs-go"
5+
"github.com/opencontainers/runtime-spec/specs-go"
66
)
77

88
func getRootIDs(s specs.Spec) (int, int, error) {

‎oci/defaults_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import (
44
"os"
55
"runtime"
66

7-
"github.com/opencontainers/specs/specs-go"
7+
"github.com/opencontainers/runtime-spec/specs-go"
88
)
99

1010
func sPtr(s string) *string { return &s }

‎oci/defaults_solaris.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
package oci
22

33
import (
4-
"github.com/opencontainers/specs/specs-go"
4+
"github.com/opencontainers/runtime-spec/specs-go"
55
)
66

77
// DefaultSpec returns default oci spec used by docker.

‎plugin/manager_linux.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ import (
1717
"github.com/docker/docker/restartmanager"
1818
"github.com/docker/engine-api/types"
1919
"github.com/docker/engine-api/types/container"
20-
"github.com/opencontainers/specs/specs-go"
20+
"github.com/opencontainers/runtime-spec/specs-go"
2121
)
2222

2323
func (pm *Manager) enable(p *plugin, force bool) error {

‎plugin/manager_windows.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ package plugin
55
import (
66
"fmt"
77

8-
"github.com/opencontainers/specs/specs-go"
8+
"github.com/opencontainers/runtime-spec/specs-go"
99
)
1010

1111
func (pm *Manager) enable(p *plugin, force bool) error {

‎profiles/seccomp/seccomp.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
"fmt"
88

99
"github.com/docker/engine-api/types"
10-
"github.com/opencontainers/specs/specs-go"
10+
"github.com/opencontainers/runtime-spec/specs-go"
1111
)
1212

1313
//go:generate go run -tags 'seccomp' generate.go

‎profiles/seccomp/seccomp_default.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ import (
66
"syscall"
77

88
"github.com/docker/engine-api/types"
9-
"github.com/opencontainers/specs/specs-go"
9+
"github.com/opencontainers/runtime-spec/specs-go"
1010
libseccomp "github.com/seccomp/libseccomp-golang"
1111
)
1212

‎profiles/seccomp/seccomp_unsupported.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ package seccomp
44

55
import (
66
"github.com/docker/engine-api/types"
7-
"github.com/opencontainers/specs/specs-go"
7+
"github.com/opencontainers/runtime-spec/specs-go"
88
)
99

1010
// DefaultProfile returns a nil pointer on unsupported systems.

0 commit comments

Comments
 (0)
Please sign in to comment.