1. docker
  2. Commit 5c487368636f7d68bdf7ec6ea74fcba2ed604d94
Browse code

remove redundant alias for runtime-spec

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2024/10/27 01:31:39
Showing 37 changed files
builder/builder-next/executor_linux.go
History View file @ 5c48736
... ... 
@@ -21,7 +21,7 @@ import (
21 21 
 	"github.com/moby/buildkit/identity"
22 22 
 	"github.com/moby/buildkit/solver/pb"
23 23 
 	"github.com/moby/buildkit/util/network"
24 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
24 
+	"github.com/opencontainers/runtime-spec/specs-go"
25 25 
 )
26 26
27 27 
 const networkName = "bridge"
daemon/cdi.go
History View file @ 5c48736
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"github.com/containerd/log"
8 8 
 	"github.com/docker/docker/errdefs"
9 9 
 	"github.com/hashicorp/go-multierror"
10 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
10 
+	"github.com/opencontainers/runtime-spec/specs-go"
11 11 
 	"github.com/pkg/errors"
12 12 
 	"tags.cncf.io/container-device-interface/pkg/cdi"
13 13 
 )
daemon/daemon_unix.go
History View file @ 5c48736
... ... 
@@ -43,7 +43,7 @@ import (
43 43 
 	"github.com/docker/docker/runconfig"
44 44 
 	volumemounts "github.com/docker/docker/volume/mounts"
45 45 
 	"github.com/moby/sys/mount"
46 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
46 
+	"github.com/opencontainers/runtime-spec/specs-go"
47 47 
 	"github.com/opencontainers/selinux/go-selinux"
48 48 
 	"github.com/opencontainers/selinux/go-selinux/label"
49 49 
 	"github.com/pkg/errors"
daemon/devices.go
History View file @ 5c48736
... ... 
@@ -3,7 +3,7 @@ package daemon // import "github.com/docker/docker/daemon"
3 3 
 import (
4 4 
 	"github.com/docker/docker/api/types/container"
5 5 
 	"github.com/docker/docker/daemon/internal/capabilities"
6 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
6 
+	"github.com/opencontainers/runtime-spec/specs-go"
7 7 
 )
8 8
9 9 
 var deviceDrivers = map[string]*deviceDriver{}
daemon/exec.go
History View file @ 5c48736
... ... 
@@ -21,7 +21,7 @@ import (
21 21 
 	"github.com/docker/docker/pkg/pools"
22 22 
 	"github.com/moby/sys/signal"
23 23 
 	"github.com/moby/term"
24 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
24 
+	"github.com/opencontainers/runtime-spec/specs-go"
25 25 
 	"github.com/pkg/errors"
26 26 
 )
27 27
daemon/exec_linux.go
History View file @ 5c48736
... ... 
@@ -9,7 +9,7 @@ import (
9 9 
 	"github.com/docker/docker/container"
10 10 
 	"github.com/docker/docker/daemon/config"
11 11 
 	"github.com/docker/docker/oci/caps"
12 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
12 
+	"github.com/opencontainers/runtime-spec/specs-go"
13 13 
 )
14 14
15 15 
 func getUserFromContainerd(ctx context.Context, containerdCli *containerd.Client, ec *container.ExecConfig) (specs.User, error) {
daemon/exec_windows.go
History View file @ 5c48736
... ... 
@@ -5,7 +5,7 @@ import (
5 5
6 6 
 	"github.com/docker/docker/container"
7 7 
 	"github.com/docker/docker/daemon/config"
8 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
8 
+	"github.com/opencontainers/runtime-spec/specs-go"
9 9 
 )
10 10
11 11 
 func (daemon *Daemon) execSetPlatformOpt(ctx context.Context, daemonCfg *config.Config, ec *container.ExecConfig, p *specs.Process) error {
daemon/metrics_unix.go
History View file @ 5c48736
... ... 
@@ -16,7 +16,7 @@ import (
16 16 
 	"github.com/docker/docker/pkg/plugins"
17 17 
 	"github.com/docker/docker/plugin"
18 18 
 	metrics "github.com/docker/go-metrics"
19 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
19 
+	"github.com/opencontainers/runtime-spec/specs-go"
20 20 
 	"github.com/pkg/errors"
21 21 
 	"golang.org/x/sys/unix"
22 22 
 )
daemon/nvidia_linux.go
History View file @ 5c48736
... ... 
@@ -8,7 +8,7 @@ import (
8 8
9 9 
 	"github.com/containerd/containerd/contrib/nvidia"
10 10 
 	"github.com/docker/docker/daemon/internal/capabilities"
11 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
11 
+	"github.com/opencontainers/runtime-spec/specs-go"
12 12 
 	"github.com/pkg/errors"
13 13 
 )
14 14
daemon/oci_linux.go
History View file @ 5c48736
... ... 
@@ -30,7 +30,7 @@ import (
30 30 
 	"github.com/moby/sys/user"
31 31 
 	"github.com/moby/sys/userns"
32 32 
 	"github.com/opencontainers/runc/libcontainer/cgroups"
33 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
33 
+	"github.com/opencontainers/runtime-spec/specs-go"
34 34 
 	"github.com/pkg/errors"
35 35 
 	"go.opentelemetry.io/otel"
36 36 
 )
daemon/oci_opts.go
History View file @ 5c48736
... ... 
@@ -6,7 +6,7 @@ import (
6 6 
 	"github.com/containerd/containerd/containers"
7 7 
 	coci "github.com/containerd/containerd/oci"
8 8 
 	"github.com/docker/docker/container"
9 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
9 
+	"github.com/opencontainers/runtime-spec/specs-go"
10 10 
 )
11 11
12 12 
 // WithConsoleSize sets the initial console size
daemon/oci_utils.go
History View file @ 5c48736
... ... 
@@ -2,7 +2,7 @@ package daemon // import "github.com/docker/docker/daemon"
2 2
3 3 
 import (
4 4 
 	"github.com/docker/docker/container"
5 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
5 
+	"github.com/opencontainers/runtime-spec/specs-go"
6 6 
 )
7 7
8 8 
 func setLinuxDomainname(c *container.Container, s *specs.Spec) {
daemon/oci_windows.go
History View file @ 5c48736
... ... 
@@ -20,7 +20,7 @@ import (
20 20 
 	"github.com/docker/docker/oci"
21 21 
 	"github.com/docker/docker/pkg/sysinfo"
22 22 
 	"github.com/docker/docker/pkg/system"
23 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
23 
+	"github.com/opencontainers/runtime-spec/specs-go"
24 24 
 	"github.com/pkg/errors"
25 25 
 	"golang.org/x/sys/windows/registry"
26 26 
 )
daemon/seccomp_linux.go
History View file @ 5c48736
... ... 
@@ -10,7 +10,7 @@ import (
10 10 
 	"github.com/docker/docker/container"
11 11 
 	dconfig "github.com/docker/docker/daemon/config"
12 12 
 	"github.com/docker/docker/profiles/seccomp"
13 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
13 
+	"github.com/opencontainers/runtime-spec/specs-go"
14 14 
 )
15 15
16 16 
 const supportsSeccomp = true
daemon/start_linux.go
History View file @ 5c48736
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"github.com/docker/docker/errdefs"
8 8 
 	"github.com/docker/docker/libcontainerd/types"
9 9 
 	"github.com/docker/docker/oci"
10 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
10 
+	"github.com/opencontainers/runtime-spec/specs-go"
11 11 
 	"go.opentelemetry.io/otel"
12 12 
 )
13 13
daemon/start_notlinux.go
History View file @ 5c48736
... ... 
@@ -7,7 +7,7 @@ import (
7 7
8 8 
 	"github.com/docker/docker/container"
9 9 
 	"github.com/docker/docker/libcontainerd/types"
10 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
10 
+	"github.com/opencontainers/runtime-spec/specs-go"
11 11 
 )
12 12
13 13 
 // initializeCreatedTask performs any initialization that needs to be done to
daemon/update_linux.go
History View file @ 5c48736
... ... 
@@ -5,7 +5,7 @@ import (
5 5
6 6 
 	"github.com/docker/docker/api/types/container"
7 7 
 	libcontainerdtypes "github.com/docker/docker/libcontainerd/types"
8 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
8 
+	"github.com/opencontainers/runtime-spec/specs-go"
9 9 
 )
10 10
11 11 
 func toContainerdResources(resources container.Resources) *libcontainerdtypes.Resources {
internal/rootless/specconv/specconv_linux.go
History View file @ 5c48736
... ... 
@@ -10,7 +10,7 @@ import (
10 10 
 	"strings"
11 11
12 12 
 	"github.com/containerd/log"
13 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
13 
+	"github.com/opencontainers/runtime-spec/specs-go"
14 14 
 )
15 15
16 16 
 // ToRootfulInRootless is used for "rootful-in-rootless" dind;
libcontainerd/local/local_windows.go
History View file @ 5c48736
... ... 
@@ -25,7 +25,7 @@ import (
25 25 
 	libcontainerdtypes "github.com/docker/docker/libcontainerd/types"
26 26 
 	"github.com/docker/docker/pkg/sysinfo"
27 27 
 	"github.com/docker/docker/pkg/system"
28 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
28 
+	"github.com/opencontainers/runtime-spec/specs-go"
29 29 
 	"github.com/pkg/errors"
30 30 
 	"golang.org/x/sys/windows"
31 31 
 	"google.golang.org/protobuf/types/known/timestamppb"
libcontainerd/remote/client.go
History View file @ 5c48736
... ... 
@@ -32,7 +32,7 @@ import (
32 32 
 	"github.com/hashicorp/go-multierror"
33 33 
 	"github.com/opencontainers/go-digest"
34 34 
 	ocispec "github.com/opencontainers/image-spec/specs-go/v1"
35 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
35 
+	"github.com/opencontainers/runtime-spec/specs-go"
36 36 
 	"github.com/pkg/errors"
37 37 
 	"go.opentelemetry.io/otel"
38 38 
 	"google.golang.org/grpc/codes"
libcontainerd/remote/client_linux.go
History View file @ 5c48736
... ... 
@@ -13,7 +13,7 @@ import (
13 13 
 	"github.com/containerd/log"
14 14 
 	libcontainerdtypes "github.com/docker/docker/libcontainerd/types"
15 15 
 	"github.com/docker/docker/pkg/idtools"
16 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
16 
+	"github.com/opencontainers/runtime-spec/specs-go"
17 17 
 )
18 18
19 19 
 func summaryFromInterface(i interface{}) (*libcontainerdtypes.Summary, error) {
libcontainerd/remote/client_windows.go
History View file @ 5c48736
... ... 
@@ -12,7 +12,7 @@ import (
12 12 
 	"github.com/containerd/containerd/containers"
13 13 
 	"github.com/containerd/log"
14 14 
 	libcontainerdtypes "github.com/docker/docker/libcontainerd/types"
15 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
15 
+	"github.com/opencontainers/runtime-spec/specs-go"
16 16 
 	"github.com/pkg/errors"
17 17 
 )
18 18
libcontainerd/types/types.go
History View file @ 5c48736
... ... 
@@ -7,7 +7,7 @@ import (
7 7
8 8 
 	"github.com/containerd/containerd"
9 9 
 	"github.com/containerd/containerd/cio"
10 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
10 
+	"github.com/opencontainers/runtime-spec/specs-go"
11 11 
 )
12 12
13 13 
 // EventType represents a possible event from libcontainerd
libcontainerd/types/types_linux.go
History View file @ 5c48736
... ... 
@@ -3,7 +3,7 @@ package types // import "github.com/docker/docker/libcontainerd/types"
3 3 
 import (
4 4 
 	"time"
5 5
6 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
6 
+	"github.com/opencontainers/runtime-spec/specs-go"
7 7 
 )
8 8
9 9 
 // Summary is not used on linux
oci/defaults.go
History View file @ 5c48736
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"runtime"
5 5
6 6 
 	"github.com/docker/docker/oci/caps"
7 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
7 
+	"github.com/opencontainers/runtime-spec/specs-go"
8 8 
 )
9 9
10 10 
 func iPtr(i int64) *int64 { return &i }
oci/devices_linux.go
History View file @ 5c48736
... ... 
@@ -7,7 +7,7 @@ import (
7 7 
 	"strings"
8 8
9 9 
 	coci "github.com/containerd/containerd/oci"
10 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
10 
+	"github.com/opencontainers/runtime-spec/specs-go"
11 11 
 )
12 12
13 13 
 func deviceCgroup(d *specs.LinuxDevice, permissions string) specs.LinuxDeviceCgroup {
oci/namespaces.go
History View file @ 5c48736
... ... 
@@ -1,6 +1,6 @@
1 1 
 package oci // import "github.com/docker/docker/oci"
2 2
3 
-import specs "github.com/opencontainers/runtime-spec/specs-go"
3 
+import "github.com/opencontainers/runtime-spec/specs-go"
4 4
5 5 
 // RemoveNamespace removes the `nsType` namespace from OCI spec `s`
6 6 
 func RemoveNamespace(s *specs.Spec, nsType specs.LinuxNamespaceType) {
oci/oci.go
History View file @ 5c48736
... ... 
@@ -5,7 +5,7 @@ import (
5 5 
 	"regexp"
6 6 
 	"strconv"
7 7
8 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
8 
+	"github.com/opencontainers/runtime-spec/specs-go"
9 9 
 )
10 10
11 11 
 // TODO verify if this regex is correct for "a" (all);
plugin/defs.go
History View file @ 5c48736
... ... 
@@ -6,7 +6,7 @@ import (
6 6
7 7 
 	"github.com/docker/docker/pkg/plugins"
8 8 
 	v2 "github.com/docker/docker/plugin/v2"
9 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
9 
+	"github.com/opencontainers/runtime-spec/specs-go"
10 10 
 )
11 11
12 12 
 // Store manages the plugin inventory in memory and on-disk
plugin/executor/containerd/containerd.go
History View file @ 5c48736
... ... 
@@ -13,7 +13,7 @@ import (
13 13 
 	"github.com/docker/docker/errdefs"
14 14 
 	"github.com/docker/docker/libcontainerd"
15 15 
 	libcontainerdtypes "github.com/docker/docker/libcontainerd/types"
16 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
16 
+	"github.com/opencontainers/runtime-spec/specs-go"
17 17 
 	"github.com/pkg/errors"
18 18 
 )
19 19
plugin/manager.go
History View file @ 5c48736
... ... 
@@ -25,7 +25,7 @@ import (
25 25 
 	"github.com/docker/docker/registry"
26 26 
 	"github.com/moby/pubsub"
27 27 
 	"github.com/opencontainers/go-digest"
28 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
28 
+	"github.com/opencontainers/runtime-spec/specs-go"
29 29 
 	"github.com/pkg/errors"
30 30 
 	"github.com/sirupsen/logrus"
31 31 
 )
plugin/manager_windows.go
History View file @ 5c48736
... ... 
@@ -4,7 +4,7 @@ import (
4 4 
 	"fmt"
5 5
6 6 
 	v2 "github.com/docker/docker/plugin/v2"
7 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
7 
+	"github.com/opencontainers/runtime-spec/specs-go"
8 8 
 )
9 9
10 10 
 func (pm *Manager) enable(p *v2.Plugin, c *controller, force bool) error {
plugin/store.go
History View file @ 5c48736
... ... 
@@ -11,7 +11,7 @@ import (
11 11 
 	"github.com/docker/docker/pkg/plugingetter"
12 12 
 	"github.com/docker/docker/pkg/plugins"
13 13 
 	v2 "github.com/docker/docker/plugin/v2"
14 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
14 
+	"github.com/opencontainers/runtime-spec/specs-go"
15 15 
 	"github.com/pkg/errors"
16 16 
 )
17 17
plugin/v2/plugin.go
History View file @ 5c48736
... ... 
@@ -12,7 +12,7 @@ import (
12 12 
 	"github.com/docker/docker/pkg/plugingetter"
13 13 
 	"github.com/docker/docker/pkg/plugins"
14 14 
 	"github.com/opencontainers/go-digest"
15 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
15 
+	"github.com/opencontainers/runtime-spec/specs-go"
16 16 
 )
17 17
18 18 
 // Plugin represents an individual plugin.
plugin/v2/plugin_linux.go
History View file @ 5c48736
... ... 
@@ -14,7 +14,7 @@ import (
14 14 
 	"github.com/docker/docker/internal/sliceutil"
15 15 
 	"github.com/docker/docker/oci"
16 16 
 	"github.com/moby/sys/userns"
17 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
17 
+	"github.com/opencontainers/runtime-spec/specs-go"
18 18 
 	"github.com/pkg/errors"
19 19 
 )
20 20
plugin/v2/plugin_unsupported.go
History View file @ 5c48736
... ... 
@@ -5,7 +5,7 @@ package v2 // import "github.com/docker/docker/plugin/v2"
5 5 
 import (
6 6 
 	"errors"
7 7
8 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
8 
+	"github.com/opencontainers/runtime-spec/specs-go"
9 9 
 )
10 10
11 11 
 // InitSpec creates an OCI spec from the plugin's config.
profiles/seccomp/seccomp_linux.go
History View file @ 5c48736
... ... 
@@ -8,7 +8,7 @@ import (
8 8 
 	"fmt"
9 9 
 	"runtime"
10 10
11 
-	specs "github.com/opencontainers/runtime-spec/specs-go"
11 
+	"github.com/opencontainers/runtime-spec/specs-go"
12 12 
 )
13 13
14 14 
 // GetDefaultProfile returns the default seccomp profile.