From 5c487368636f7d68bdf7ec6ea74fcba2ed604d94 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Sat, 26 Oct 2024 18:31:39 +0200 Subject: [PATCH] remove redundant alias for runtime-spec Signed-off-by: Sebastiaan van Stijn --- builder/builder-next/executor_linux.go | 2 +- daemon/cdi.go | 2 +- daemon/daemon_unix.go | 2 +- daemon/devices.go | 2 +- daemon/exec.go | 2 +- daemon/exec_linux.go | 2 +- daemon/exec_windows.go | 2 +- daemon/metrics_unix.go | 2 +- daemon/nvidia_linux.go | 2 +- daemon/oci_linux.go | 2 +- daemon/oci_opts.go | 2 +- daemon/oci_utils.go | 2 +- daemon/oci_windows.go | 2 +- daemon/seccomp_linux.go | 2 +- daemon/start_linux.go | 2 +- daemon/start_notlinux.go | 2 +- daemon/update_linux.go | 2 +- internal/rootless/specconv/specconv_linux.go | 2 +- libcontainerd/local/local_windows.go | 2 +- libcontainerd/remote/client.go | 2 +- libcontainerd/remote/client_linux.go | 2 +- libcontainerd/remote/client_windows.go | 2 +- libcontainerd/types/types.go | 2 +- libcontainerd/types/types_linux.go | 2 +- oci/defaults.go | 2 +- oci/devices_linux.go | 2 +- oci/namespaces.go | 2 +- oci/oci.go | 2 +- plugin/defs.go | 2 +- plugin/executor/containerd/containerd.go | 2 +- plugin/manager.go | 2 +- plugin/manager_windows.go | 2 +- plugin/store.go | 2 +- plugin/v2/plugin.go | 2 +- plugin/v2/plugin_linux.go | 2 +- plugin/v2/plugin_unsupported.go | 2 +- profiles/seccomp/seccomp_linux.go | 2 +- 37 files changed, 37 insertions(+), 37 deletions(-) diff --git a/builder/builder-next/executor_linux.go b/builder/builder-next/executor_linux.go index 38709052ee..5e9b06ae6a 100644 --- a/builder/builder-next/executor_linux.go +++ b/builder/builder-next/executor_linux.go @@ -21,7 +21,7 @@ import ( "github.com/moby/buildkit/identity" "github.com/moby/buildkit/solver/pb" "github.com/moby/buildkit/util/network" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) const networkName = "bridge" diff --git a/daemon/cdi.go b/daemon/cdi.go index 75b5951113..6295d8466b 100644 --- a/daemon/cdi.go +++ b/daemon/cdi.go @@ -7,7 +7,7 @@ import ( "github.com/containerd/log" "github.com/docker/docker/errdefs" "github.com/hashicorp/go-multierror" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "tags.cncf.io/container-device-interface/pkg/cdi" ) diff --git a/daemon/daemon_unix.go b/daemon/daemon_unix.go index 278b316db7..1ddacd9562 100644 --- a/daemon/daemon_unix.go +++ b/daemon/daemon_unix.go @@ -43,7 +43,7 @@ import ( "github.com/docker/docker/runconfig" volumemounts "github.com/docker/docker/volume/mounts" "github.com/moby/sys/mount" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/opencontainers/selinux/go-selinux" "github.com/opencontainers/selinux/go-selinux/label" "github.com/pkg/errors" diff --git a/daemon/devices.go b/daemon/devices.go index 0f3b733e9c..0ed86a61bb 100644 --- a/daemon/devices.go +++ b/daemon/devices.go @@ -3,7 +3,7 @@ package daemon // import "github.com/docker/docker/daemon" import ( "github.com/docker/docker/api/types/container" "github.com/docker/docker/daemon/internal/capabilities" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) var deviceDrivers = map[string]*deviceDriver{} diff --git a/daemon/exec.go b/daemon/exec.go index 1ca74b122c..4f37756c88 100644 --- a/daemon/exec.go +++ b/daemon/exec.go @@ -21,7 +21,7 @@ import ( "github.com/docker/docker/pkg/pools" "github.com/moby/sys/signal" "github.com/moby/term" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/daemon/exec_linux.go b/daemon/exec_linux.go index 7c44c40869..3ab7492b22 100644 --- a/daemon/exec_linux.go +++ b/daemon/exec_linux.go @@ -9,7 +9,7 @@ import ( "github.com/docker/docker/container" "github.com/docker/docker/daemon/config" "github.com/docker/docker/oci/caps" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) func getUserFromContainerd(ctx context.Context, containerdCli *containerd.Client, ec *container.ExecConfig) (specs.User, error) { diff --git a/daemon/exec_windows.go b/daemon/exec_windows.go index f0f0354eba..d07e7ffa82 100644 --- a/daemon/exec_windows.go +++ b/daemon/exec_windows.go @@ -5,7 +5,7 @@ import ( "github.com/docker/docker/container" "github.com/docker/docker/daemon/config" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) func (daemon *Daemon) execSetPlatformOpt(ctx context.Context, daemonCfg *config.Config, ec *container.ExecConfig, p *specs.Process) error { diff --git a/daemon/metrics_unix.go b/daemon/metrics_unix.go index 24fd6cb551..dfa0787c29 100644 --- a/daemon/metrics_unix.go +++ b/daemon/metrics_unix.go @@ -16,7 +16,7 @@ import ( "github.com/docker/docker/pkg/plugins" "github.com/docker/docker/plugin" metrics "github.com/docker/go-metrics" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "golang.org/x/sys/unix" ) diff --git a/daemon/nvidia_linux.go b/daemon/nvidia_linux.go index 7f3df0617d..60d3165a59 100644 --- a/daemon/nvidia_linux.go +++ b/daemon/nvidia_linux.go @@ -8,7 +8,7 @@ import ( "github.com/containerd/containerd/contrib/nvidia" "github.com/docker/docker/daemon/internal/capabilities" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/daemon/oci_linux.go b/daemon/oci_linux.go index ca77940f3e..2a8ca1be6f 100644 --- a/daemon/oci_linux.go +++ b/daemon/oci_linux.go @@ -30,7 +30,7 @@ import ( "github.com/moby/sys/user" "github.com/moby/sys/userns" "github.com/opencontainers/runc/libcontainer/cgroups" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "go.opentelemetry.io/otel" ) diff --git a/daemon/oci_opts.go b/daemon/oci_opts.go index c8b1b633b6..3816bce19f 100644 --- a/daemon/oci_opts.go +++ b/daemon/oci_opts.go @@ -6,7 +6,7 @@ import ( "github.com/containerd/containerd/containers" coci "github.com/containerd/containerd/oci" "github.com/docker/docker/container" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) // WithConsoleSize sets the initial console size diff --git a/daemon/oci_utils.go b/daemon/oci_utils.go index a47f7bab44..6c51691bad 100644 --- a/daemon/oci_utils.go +++ b/daemon/oci_utils.go @@ -2,7 +2,7 @@ package daemon // import "github.com/docker/docker/daemon" import ( "github.com/docker/docker/container" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) func setLinuxDomainname(c *container.Container, s *specs.Spec) { diff --git a/daemon/oci_windows.go b/daemon/oci_windows.go index bbb20265ac..3110746588 100644 --- a/daemon/oci_windows.go +++ b/daemon/oci_windows.go @@ -20,7 +20,7 @@ import ( "github.com/docker/docker/oci" "github.com/docker/docker/pkg/sysinfo" "github.com/docker/docker/pkg/system" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "golang.org/x/sys/windows/registry" ) diff --git a/daemon/seccomp_linux.go b/daemon/seccomp_linux.go index 0d14022db9..3dbd35e3a3 100644 --- a/daemon/seccomp_linux.go +++ b/daemon/seccomp_linux.go @@ -10,7 +10,7 @@ import ( "github.com/docker/docker/container" dconfig "github.com/docker/docker/daemon/config" "github.com/docker/docker/profiles/seccomp" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) const supportsSeccomp = true diff --git a/daemon/start_linux.go b/daemon/start_linux.go index fa20dca16d..5e23bdbe33 100644 --- a/daemon/start_linux.go +++ b/daemon/start_linux.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/libcontainerd/types" "github.com/docker/docker/oci" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "go.opentelemetry.io/otel" ) diff --git a/daemon/start_notlinux.go b/daemon/start_notlinux.go index 0170e38cca..06d5b4a7fd 100644 --- a/daemon/start_notlinux.go +++ b/daemon/start_notlinux.go @@ -7,7 +7,7 @@ import ( "github.com/docker/docker/container" "github.com/docker/docker/libcontainerd/types" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) // initializeCreatedTask performs any initialization that needs to be done to diff --git a/daemon/update_linux.go b/daemon/update_linux.go index 8f3bde9eed..d13795c1ee 100644 --- a/daemon/update_linux.go +++ b/daemon/update_linux.go @@ -5,7 +5,7 @@ import ( "github.com/docker/docker/api/types/container" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) func toContainerdResources(resources container.Resources) *libcontainerdtypes.Resources { diff --git a/internal/rootless/specconv/specconv_linux.go b/internal/rootless/specconv/specconv_linux.go index 365b946bf0..c73de8c1c0 100644 --- a/internal/rootless/specconv/specconv_linux.go +++ b/internal/rootless/specconv/specconv_linux.go @@ -10,7 +10,7 @@ import ( "strings" "github.com/containerd/log" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) // ToRootfulInRootless is used for "rootful-in-rootless" dind; diff --git a/libcontainerd/local/local_windows.go b/libcontainerd/local/local_windows.go index 75541f7cf7..e767faa993 100644 --- a/libcontainerd/local/local_windows.go +++ b/libcontainerd/local/local_windows.go @@ -25,7 +25,7 @@ import ( libcontainerdtypes "github.com/docker/docker/libcontainerd/types" "github.com/docker/docker/pkg/sysinfo" "github.com/docker/docker/pkg/system" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "golang.org/x/sys/windows" "google.golang.org/protobuf/types/known/timestamppb" diff --git a/libcontainerd/remote/client.go b/libcontainerd/remote/client.go index 66a857b674..12084cbc3a 100644 --- a/libcontainerd/remote/client.go +++ b/libcontainerd/remote/client.go @@ -32,7 +32,7 @@ import ( "github.com/hashicorp/go-multierror" "github.com/opencontainers/go-digest" ocispec "github.com/opencontainers/image-spec/specs-go/v1" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "go.opentelemetry.io/otel" "google.golang.org/grpc/codes" diff --git a/libcontainerd/remote/client_linux.go b/libcontainerd/remote/client_linux.go index 0c9eb575ca..a629ab0e32 100644 --- a/libcontainerd/remote/client_linux.go +++ b/libcontainerd/remote/client_linux.go @@ -13,7 +13,7 @@ import ( "github.com/containerd/log" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" "github.com/docker/docker/pkg/idtools" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) func summaryFromInterface(i interface{}) (*libcontainerdtypes.Summary, error) { diff --git a/libcontainerd/remote/client_windows.go b/libcontainerd/remote/client_windows.go index 39be66abff..be5566c0c7 100644 --- a/libcontainerd/remote/client_windows.go +++ b/libcontainerd/remote/client_windows.go @@ -12,7 +12,7 @@ import ( "github.com/containerd/containerd/containers" "github.com/containerd/log" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/libcontainerd/types/types.go b/libcontainerd/types/types.go index f05eb4fc90..38e1d9207a 100644 --- a/libcontainerd/types/types.go +++ b/libcontainerd/types/types.go @@ -7,7 +7,7 @@ import ( "github.com/containerd/containerd" "github.com/containerd/containerd/cio" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) // EventType represents a possible event from libcontainerd diff --git a/libcontainerd/types/types_linux.go b/libcontainerd/types/types_linux.go index c91bcb9223..ef85404c90 100644 --- a/libcontainerd/types/types_linux.go +++ b/libcontainerd/types/types_linux.go @@ -3,7 +3,7 @@ package types // import "github.com/docker/docker/libcontainerd/types" import ( "time" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) // Summary is not used on linux diff --git a/oci/defaults.go b/oci/defaults.go index c3dae8b109..bae5fca22f 100644 --- a/oci/defaults.go +++ b/oci/defaults.go @@ -4,7 +4,7 @@ import ( "runtime" "github.com/docker/docker/oci/caps" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) func iPtr(i int64) *int64 { return &i } diff --git a/oci/devices_linux.go b/oci/devices_linux.go index 5b6c6cf4a6..fe268dd270 100644 --- a/oci/devices_linux.go +++ b/oci/devices_linux.go @@ -7,7 +7,7 @@ import ( "strings" coci "github.com/containerd/containerd/oci" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) func deviceCgroup(d *specs.LinuxDevice, permissions string) specs.LinuxDeviceCgroup { diff --git a/oci/namespaces.go b/oci/namespaces.go index befcefcc40..4b577a7bc5 100644 --- a/oci/namespaces.go +++ b/oci/namespaces.go @@ -1,6 +1,6 @@ package oci // import "github.com/docker/docker/oci" -import specs "github.com/opencontainers/runtime-spec/specs-go" +import "github.com/opencontainers/runtime-spec/specs-go" // RemoveNamespace removes the `nsType` namespace from OCI spec `s` func RemoveNamespace(s *specs.Spec, nsType specs.LinuxNamespaceType) { diff --git a/oci/oci.go b/oci/oci.go index 45ed7979ee..825ca34d40 100644 --- a/oci/oci.go +++ b/oci/oci.go @@ -5,7 +5,7 @@ import ( "regexp" "strconv" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) // TODO verify if this regex is correct for "a" (all); diff --git a/plugin/defs.go b/plugin/defs.go index 90268ef767..96607479bd 100644 --- a/plugin/defs.go +++ b/plugin/defs.go @@ -6,7 +6,7 @@ import ( "github.com/docker/docker/pkg/plugins" v2 "github.com/docker/docker/plugin/v2" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) // Store manages the plugin inventory in memory and on-disk diff --git a/plugin/executor/containerd/containerd.go b/plugin/executor/containerd/containerd.go index 4c7c03bee0..b2974e708c 100644 --- a/plugin/executor/containerd/containerd.go +++ b/plugin/executor/containerd/containerd.go @@ -13,7 +13,7 @@ import ( "github.com/docker/docker/errdefs" "github.com/docker/docker/libcontainerd" libcontainerdtypes "github.com/docker/docker/libcontainerd/types" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/plugin/manager.go b/plugin/manager.go index 5b995c107d..e9f439a17a 100644 --- a/plugin/manager.go +++ b/plugin/manager.go @@ -25,7 +25,7 @@ import ( "github.com/docker/docker/registry" "github.com/moby/pubsub" "github.com/opencontainers/go-digest" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" "github.com/sirupsen/logrus" ) diff --git a/plugin/manager_windows.go b/plugin/manager_windows.go index 003b2210f9..5f8f84c2e0 100644 --- a/plugin/manager_windows.go +++ b/plugin/manager_windows.go @@ -4,7 +4,7 @@ import ( "fmt" v2 "github.com/docker/docker/plugin/v2" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) func (pm *Manager) enable(p *v2.Plugin, c *controller, force bool) error { diff --git a/plugin/store.go b/plugin/store.go index 4644993f06..a1f657219a 100644 --- a/plugin/store.go +++ b/plugin/store.go @@ -11,7 +11,7 @@ import ( "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugins" v2 "github.com/docker/docker/plugin/v2" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/plugin/v2/plugin.go b/plugin/v2/plugin.go index 5712a94847..a49af68425 100644 --- a/plugin/v2/plugin.go +++ b/plugin/v2/plugin.go @@ -12,7 +12,7 @@ import ( "github.com/docker/docker/pkg/plugingetter" "github.com/docker/docker/pkg/plugins" "github.com/opencontainers/go-digest" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) // Plugin represents an individual plugin. diff --git a/plugin/v2/plugin_linux.go b/plugin/v2/plugin_linux.go index bdd8891498..e8b3842d21 100644 --- a/plugin/v2/plugin_linux.go +++ b/plugin/v2/plugin_linux.go @@ -14,7 +14,7 @@ import ( "github.com/docker/docker/internal/sliceutil" "github.com/docker/docker/oci" "github.com/moby/sys/userns" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" "github.com/pkg/errors" ) diff --git a/plugin/v2/plugin_unsupported.go b/plugin/v2/plugin_unsupported.go index 022a604b06..39b3ed379f 100644 --- a/plugin/v2/plugin_unsupported.go +++ b/plugin/v2/plugin_unsupported.go @@ -5,7 +5,7 @@ package v2 // import "github.com/docker/docker/plugin/v2" import ( "errors" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) // InitSpec creates an OCI spec from the plugin's config. diff --git a/profiles/seccomp/seccomp_linux.go b/profiles/seccomp/seccomp_linux.go index 17ee350e27..0d32f09358 100644 --- a/profiles/seccomp/seccomp_linux.go +++ b/profiles/seccomp/seccomp_linux.go @@ -8,7 +8,7 @@ import ( "fmt" "runtime" - specs "github.com/opencontainers/runtime-spec/specs-go" + "github.com/opencontainers/runtime-spec/specs-go" ) // GetDefaultProfile returns the default seccomp profile.