summaryrefslogtreecommitdiff
path: root/vendor/github.com
diff options
context:
space:
mode:
authormo khan <mo@mokhan.ca>2025-07-04 11:12:51 -0600
committermo khan <mo@mokhan.ca>2025-07-04 11:12:51 -0600
commit12736451bf5e7773ff41794d537fa1c3bdbe7912 (patch)
tree082afeaa70151ff071d9063876003bd217fa53fc /vendor/github.com
parenta4d071362fde79e346ae5fe600c16ae71967167f (diff)
chore: update modules
Diffstat (limited to 'vendor/github.com')
-rw-r--r--vendor/github.com/docker/docker/api/common.go4
-rw-r--r--vendor/github.com/docker/docker/api/swagger.yaml11
-rw-r--r--vendor/github.com/docker/docker/api/types/blkiodev/blkio.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/client.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/container/config.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/container/exec.go4
-rw-r--r--vendor/github.com/docker/docker/api/types/container/hostconfig.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/container/waitcondition.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/events/events.go14
-rw-r--r--vendor/github.com/docker/docker/api/types/filters/parse.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/image/image_history.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/image/opts.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/mount/mount.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/network/network.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/plugin_responses.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/registry/authconfig.go3
-rw-r--r--vendor/github.com/docker/docker/api/types/registry/authenticate.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/registry/registry.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/strslice/strslice.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/swarm/common.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/swarm/config.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/swarm/container.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/swarm/network.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/swarm/node.go3
-rw-r--r--vendor/github.com/docker/docker/api/types/swarm/runtime.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/swarm/runtime/gen.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/swarm/secret.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/swarm/service.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/swarm/swarm.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/swarm/task.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/time/timestamp.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/types.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/versions/compare.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/volume/options.go2
-rw-r--r--vendor/github.com/docker/docker/api/types/volume/volume_update.go2
-rw-r--r--vendor/github.com/docker/docker/client/build_cancel.go2
-rw-r--r--vendor/github.com/docker/docker/client/build_prune.go2
-rw-r--r--vendor/github.com/docker/docker/client/checkpoint.go2
-rw-r--r--vendor/github.com/docker/docker/client/checkpoint_create.go2
-rw-r--r--vendor/github.com/docker/docker/client/checkpoint_delete.go2
-rw-r--r--vendor/github.com/docker/docker/client/checkpoint_list.go2
-rw-r--r--vendor/github.com/docker/docker/client/client.go2
-rw-r--r--vendor/github.com/docker/docker/client/client_interfaces.go2
-rw-r--r--vendor/github.com/docker/docker/client/client_unix.go2
-rw-r--r--vendor/github.com/docker/docker/client/client_windows.go2
-rw-r--r--vendor/github.com/docker/docker/client/config_create.go2
-rw-r--r--vendor/github.com/docker/docker/client/config_inspect.go2
-rw-r--r--vendor/github.com/docker/docker/client/config_list.go2
-rw-r--r--vendor/github.com/docker/docker/client/config_remove.go2
-rw-r--r--vendor/github.com/docker/docker/client/config_update.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_attach.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_commit.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_copy.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_create.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_diff.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_exec.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_export.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_inspect.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_kill.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_list.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_logs.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_pause.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_prune.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_remove.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_rename.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_resize.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_restart.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_start.go6
-rw-r--r--vendor/github.com/docker/docker/client/container_stats.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_stop.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_top.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_unpause.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_update.go2
-rw-r--r--vendor/github.com/docker/docker/client/container_wait.go2
-rw-r--r--vendor/github.com/docker/docker/client/disk_usage.go2
-rw-r--r--vendor/github.com/docker/docker/client/distribution_inspect.go2
-rw-r--r--vendor/github.com/docker/docker/client/envvars.go2
-rw-r--r--vendor/github.com/docker/docker/client/errors.go2
-rw-r--r--vendor/github.com/docker/docker/client/events.go2
-rw-r--r--vendor/github.com/docker/docker/client/hijack.go4
-rw-r--r--vendor/github.com/docker/docker/client/image_build.go2
-rw-r--r--vendor/github.com/docker/docker/client/image_create.go2
-rw-r--r--vendor/github.com/docker/docker/client/image_history.go2
-rw-r--r--vendor/github.com/docker/docker/client/image_import.go2
-rw-r--r--vendor/github.com/docker/docker/client/image_inspect.go2
-rw-r--r--vendor/github.com/docker/docker/client/image_list.go2
-rw-r--r--vendor/github.com/docker/docker/client/image_load.go2
-rw-r--r--vendor/github.com/docker/docker/client/image_prune.go2
-rw-r--r--vendor/github.com/docker/docker/client/image_pull.go2
-rw-r--r--vendor/github.com/docker/docker/client/image_push.go2
-rw-r--r--vendor/github.com/docker/docker/client/image_remove.go2
-rw-r--r--vendor/github.com/docker/docker/client/image_save.go2
-rw-r--r--vendor/github.com/docker/docker/client/image_search.go2
-rw-r--r--vendor/github.com/docker/docker/client/image_tag.go2
-rw-r--r--vendor/github.com/docker/docker/client/info.go2
-rw-r--r--vendor/github.com/docker/docker/client/login.go2
-rw-r--r--vendor/github.com/docker/docker/client/network_connect.go2
-rw-r--r--vendor/github.com/docker/docker/client/network_create.go2
-rw-r--r--vendor/github.com/docker/docker/client/network_disconnect.go2
-rw-r--r--vendor/github.com/docker/docker/client/network_inspect.go2
-rw-r--r--vendor/github.com/docker/docker/client/network_list.go2
-rw-r--r--vendor/github.com/docker/docker/client/network_prune.go2
-rw-r--r--vendor/github.com/docker/docker/client/network_remove.go2
-rw-r--r--vendor/github.com/docker/docker/client/node_inspect.go2
-rw-r--r--vendor/github.com/docker/docker/client/node_list.go2
-rw-r--r--vendor/github.com/docker/docker/client/node_remove.go2
-rw-r--r--vendor/github.com/docker/docker/client/node_update.go2
-rw-r--r--vendor/github.com/docker/docker/client/ping.go2
-rw-r--r--vendor/github.com/docker/docker/client/plugin_create.go2
-rw-r--r--vendor/github.com/docker/docker/client/plugin_disable.go2
-rw-r--r--vendor/github.com/docker/docker/client/plugin_enable.go2
-rw-r--r--vendor/github.com/docker/docker/client/plugin_inspect.go2
-rw-r--r--vendor/github.com/docker/docker/client/plugin_install.go2
-rw-r--r--vendor/github.com/docker/docker/client/plugin_list.go2
-rw-r--r--vendor/github.com/docker/docker/client/plugin_push.go2
-rw-r--r--vendor/github.com/docker/docker/client/plugin_remove.go2
-rw-r--r--vendor/github.com/docker/docker/client/plugin_set.go2
-rw-r--r--vendor/github.com/docker/docker/client/plugin_upgrade.go2
-rw-r--r--vendor/github.com/docker/docker/client/request.go2
-rw-r--r--vendor/github.com/docker/docker/client/secret_create.go2
-rw-r--r--vendor/github.com/docker/docker/client/secret_inspect.go2
-rw-r--r--vendor/github.com/docker/docker/client/secret_list.go2
-rw-r--r--vendor/github.com/docker/docker/client/secret_remove.go2
-rw-r--r--vendor/github.com/docker/docker/client/secret_update.go2
-rw-r--r--vendor/github.com/docker/docker/client/service_create.go2
-rw-r--r--vendor/github.com/docker/docker/client/service_inspect.go2
-rw-r--r--vendor/github.com/docker/docker/client/service_list.go2
-rw-r--r--vendor/github.com/docker/docker/client/service_logs.go2
-rw-r--r--vendor/github.com/docker/docker/client/service_remove.go2
-rw-r--r--vendor/github.com/docker/docker/client/service_update.go2
-rw-r--r--vendor/github.com/docker/docker/client/swarm_get_unlock_key.go2
-rw-r--r--vendor/github.com/docker/docker/client/swarm_init.go2
-rw-r--r--vendor/github.com/docker/docker/client/swarm_inspect.go2
-rw-r--r--vendor/github.com/docker/docker/client/swarm_join.go2
-rw-r--r--vendor/github.com/docker/docker/client/swarm_leave.go2
-rw-r--r--vendor/github.com/docker/docker/client/swarm_unlock.go2
-rw-r--r--vendor/github.com/docker/docker/client/swarm_update.go2
-rw-r--r--vendor/github.com/docker/docker/client/task_inspect.go2
-rw-r--r--vendor/github.com/docker/docker/client/task_list.go2
-rw-r--r--vendor/github.com/docker/docker/client/task_logs.go2
-rw-r--r--vendor/github.com/docker/docker/client/utils.go4
-rw-r--r--vendor/github.com/docker/docker/client/version.go2
-rw-r--r--vendor/github.com/docker/docker/client/volume_create.go2
-rw-r--r--vendor/github.com/docker/docker/client/volume_inspect.go2
-rw-r--r--vendor/github.com/docker/docker/client/volume_list.go2
-rw-r--r--vendor/github.com/docker/docker/client/volume_prune.go2
-rw-r--r--vendor/github.com/docker/docker/client/volume_remove.go2
-rw-r--r--vendor/github.com/docker/docker/client/volume_update.go2
-rw-r--r--vendor/github.com/docker/docker/errdefs/doc.go2
-rw-r--r--vendor/github.com/docker/docker/pkg/idtools/idtools.go4
-rw-r--r--vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go2
-rw-r--r--vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go6
-rw-r--r--vendor/github.com/go-jose/go-jose/v4/jwe.go19
-rw-r--r--vendor/github.com/go-jose/go-jose/v4/jwk.go2
-rw-r--r--vendor/github.com/go-jose/go-jose/v4/jws.go22
-rw-r--r--vendor/github.com/go-jose/go-jose/v4/symmetric.go5
-rw-r--r--vendor/github.com/go-jose/go-jose/v4/symmetric_go124.go28
-rw-r--r--vendor/github.com/go-jose/go-jose/v4/symmetric_legacy.go29
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/cpu/cpu_linux.go2
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/cpu/cpu_solaris.go6
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/internal/common/common.go8
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/internal/common/common_linux.go4
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/internal/common/common_unix.go2
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/internal/common/readlink_linux.go53
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/mem/ex_windows.go24
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/net/net.go8
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/net/net_aix.go4
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/net/net_linux.go4
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/net/net_openbsd.go8
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/net/net_unix.go8
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/process/process_darwin.go9
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/process/process_linux.go22
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/process/process_openbsd.go2
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/process/process_posix.go3
-rw-r--r--vendor/github.com/shirou/gopsutil/v4/process/process_windows.go3
177 files changed, 379 insertions, 245 deletions
diff --git a/vendor/github.com/docker/docker/api/common.go b/vendor/github.com/docker/docker/api/common.go
index c375c68..702d3dc 100644
--- a/vendor/github.com/docker/docker/api/common.go
+++ b/vendor/github.com/docker/docker/api/common.go
@@ -1,9 +1,9 @@
-package api // import "github.com/docker/docker/api"
+package api
// Common constants for daemon and client.
const (
// DefaultVersion of the current REST API.
- DefaultVersion = "1.50"
+ DefaultVersion = "1.51"
// MinSupportedAPIVersion is the minimum API version that can be supported
// by the API server, specified as "major.minor". Note that the daemon
diff --git a/vendor/github.com/docker/docker/api/swagger.yaml b/vendor/github.com/docker/docker/api/swagger.yaml
index 619b447..8d6a8f9 100644
--- a/vendor/github.com/docker/docker/api/swagger.yaml
+++ b/vendor/github.com/docker/docker/api/swagger.yaml
@@ -19,10 +19,10 @@ produces:
consumes:
- "application/json"
- "text/plain"
-basePath: "/v1.50"
+basePath: "/v1.51"
info:
title: "Docker Engine API"
- version: "1.50"
+ version: "1.51"
x-logo:
url: "https://docs.docker.com/assets/images/logo-docker-main.png"
description: |
@@ -56,7 +56,7 @@ info:
is returned.
If you omit the version-prefix, the current version of the API (v1.50) is used.
- For example, calling `/info` is the same as calling `/v1.50/info`. Using the
+ For example, calling `/info` is the same as calling `/v1.51/info`. Using the
API without a version-prefix is deprecated and will be removed in a future release.
Engine releases in the near future should support this version of the API,
@@ -2196,8 +2196,7 @@ definitions:
Number of containers using this image. Includes both stopped and running
containers.
- This size is not calculated by default, and depends on which API endpoint
- is used. `-1` indicates that the value has not been set / calculated.
+ `-1` indicates that the value has not been set / calculated.
x-nullable: false
type: "integer"
example: 2
@@ -5863,7 +5862,7 @@ definitions:
type: "integer"
format: "uint64"
x-nullable: true
- example: 18446744073709551615
+ example: "18446744073709551615"
ContainerThrottlingData:
description: |
diff --git a/vendor/github.com/docker/docker/api/types/blkiodev/blkio.go b/vendor/github.com/docker/docker/api/types/blkiodev/blkio.go
index bf3463b..931ae10 100644
--- a/vendor/github.com/docker/docker/api/types/blkiodev/blkio.go
+++ b/vendor/github.com/docker/docker/api/types/blkiodev/blkio.go
@@ -1,4 +1,4 @@
-package blkiodev // import "github.com/docker/docker/api/types/blkiodev"
+package blkiodev
import "fmt"
diff --git a/vendor/github.com/docker/docker/api/types/client.go b/vendor/github.com/docker/docker/api/types/client.go
index a3704ed..42fe03e 100644
--- a/vendor/github.com/docker/docker/api/types/client.go
+++ b/vendor/github.com/docker/docker/api/types/client.go
@@ -1,4 +1,4 @@
-package types // import "github.com/docker/docker/api/types"
+package types
import (
"bufio"
diff --git a/vendor/github.com/docker/docker/api/types/container/config.go b/vendor/github.com/docker/docker/api/types/container/config.go
index d6b03e8..0555416 100644
--- a/vendor/github.com/docker/docker/api/types/container/config.go
+++ b/vendor/github.com/docker/docker/api/types/container/config.go
@@ -1,4 +1,4 @@
-package container // import "github.com/docker/docker/api/types/container"
+package container
import (
"time"
diff --git a/vendor/github.com/docker/docker/api/types/container/exec.go b/vendor/github.com/docker/docker/api/types/container/exec.go
index f4b2237..e455cd2 100644
--- a/vendor/github.com/docker/docker/api/types/container/exec.go
+++ b/vendor/github.com/docker/docker/api/types/container/exec.go
@@ -18,11 +18,13 @@ type ExecOptions struct {
AttachStdin bool // Attach the standard input, makes possible user interaction
AttachStderr bool // Attach the standard error
AttachStdout bool // Attach the standard output
- Detach bool // Execute in detach mode
DetachKeys string // Escape keys for detach
Env []string // Environment variables
WorkingDir string // Working directory
Cmd []string // Execution commands and args
+
+ // Deprecated: the Detach field is not used, and will be removed in a future release.
+ Detach bool
}
// ExecStartOptions is a temp struct used by execStart
diff --git a/vendor/github.com/docker/docker/api/types/container/hostconfig.go b/vendor/github.com/docker/docker/api/types/container/hostconfig.go
index 87ca826..f63f049 100644
--- a/vendor/github.com/docker/docker/api/types/container/hostconfig.go
+++ b/vendor/github.com/docker/docker/api/types/container/hostconfig.go
@@ -1,4 +1,4 @@
-package container // import "github.com/docker/docker/api/types/container"
+package container
import (
"errors"
diff --git a/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go b/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go
index cdee49e..cd6a7a9 100644
--- a/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go
+++ b/vendor/github.com/docker/docker/api/types/container/hostconfig_unix.go
@@ -1,6 +1,6 @@
//go:build !windows
-package container // import "github.com/docker/docker/api/types/container"
+package container
import "github.com/docker/docker/api/types/network"
diff --git a/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go b/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go
index f085455..db63e19 100644
--- a/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go
+++ b/vendor/github.com/docker/docker/api/types/container/hostconfig_windows.go
@@ -1,4 +1,4 @@
-package container // import "github.com/docker/docker/api/types/container"
+package container
import "github.com/docker/docker/api/types/network"
diff --git a/vendor/github.com/docker/docker/api/types/container/waitcondition.go b/vendor/github.com/docker/docker/api/types/container/waitcondition.go
index cd8311f..64820fe 100644
--- a/vendor/github.com/docker/docker/api/types/container/waitcondition.go
+++ b/vendor/github.com/docker/docker/api/types/container/waitcondition.go
@@ -1,4 +1,4 @@
-package container // import "github.com/docker/docker/api/types/container"
+package container
// WaitCondition is a type used to specify a container state for which
// to wait.
diff --git a/vendor/github.com/docker/docker/api/types/events/events.go b/vendor/github.com/docker/docker/api/types/events/events.go
index e225df4..952c0ff 100644
--- a/vendor/github.com/docker/docker/api/types/events/events.go
+++ b/vendor/github.com/docker/docker/api/types/events/events.go
@@ -1,4 +1,5 @@
-package events // import "github.com/docker/docker/api/types/events"
+package events
+
import "github.com/docker/docker/api/types/filters"
// Type is used for event-types.
@@ -111,11 +112,14 @@ type Actor struct {
// Message represents the information an event contains
type Message struct {
- // Deprecated information from JSONMessage.
+ // Deprecated: use Action instead.
+ // Information from JSONMessage.
// With data only in container events.
- Status string `json:"status,omitempty"` // Deprecated: use Action instead.
- ID string `json:"id,omitempty"` // Deprecated: use Actor.ID instead.
- From string `json:"from,omitempty"` // Deprecated: use Actor.Attributes["image"] instead.
+ Status string `json:"status,omitempty"`
+ // Deprecated: use Actor.ID instead.
+ ID string `json:"id,omitempty"`
+ // Deprecated: use Actor.Attributes["image"] instead.
+ From string `json:"from,omitempty"`
Type Type
Action Action
diff --git a/vendor/github.com/docker/docker/api/types/filters/parse.go b/vendor/github.com/docker/docker/api/types/filters/parse.go
index 2085ff3..86f4bdb 100644
--- a/vendor/github.com/docker/docker/api/types/filters/parse.go
+++ b/vendor/github.com/docker/docker/api/types/filters/parse.go
@@ -2,7 +2,7 @@
Package filters provides tools for encoding a mapping of keys to a set of
multiple values.
*/
-package filters // import "github.com/docker/docker/api/types/filters"
+package filters
import (
"encoding/json"
diff --git a/vendor/github.com/docker/docker/api/types/image/image_history.go b/vendor/github.com/docker/docker/api/types/image/image_history.go
index e302bb0..a6cdab8 100644
--- a/vendor/github.com/docker/docker/api/types/image/image_history.go
+++ b/vendor/github.com/docker/docker/api/types/image/image_history.go
@@ -1,4 +1,4 @@
-package image // import "github.com/docker/docker/api/types/image"
+package image
// ----------------------------------------------------------------------------
// Code generated by `swagger generate operation`. DO NOT EDIT.
diff --git a/vendor/github.com/docker/docker/api/types/image/opts.go b/vendor/github.com/docker/docker/api/types/image/opts.go
index fd03855..9e33a42 100644
--- a/vendor/github.com/docker/docker/api/types/image/opts.go
+++ b/vendor/github.com/docker/docker/api/types/image/opts.go
@@ -75,6 +75,8 @@ type ListOptions struct {
SharedSize bool
// ContainerCount indicates whether container count should be computed.
+ //
+ // Deprecated: This field has been unused and is no longer required and will be removed in a future version.
ContainerCount bool
// Manifests indicates whether the image manifests should be returned.
diff --git a/vendor/github.com/docker/docker/api/types/mount/mount.go b/vendor/github.com/docker/docker/api/types/mount/mount.go
index d98dbec..090d436 100644
--- a/vendor/github.com/docker/docker/api/types/mount/mount.go
+++ b/vendor/github.com/docker/docker/api/types/mount/mount.go
@@ -1,4 +1,4 @@
-package mount // import "github.com/docker/docker/api/types/mount"
+package mount
import (
"os"
diff --git a/vendor/github.com/docker/docker/api/types/network/network.go b/vendor/github.com/docker/docker/api/types/network/network.go
index d34b8ab..4a0cb47 100644
--- a/vendor/github.com/docker/docker/api/types/network/network.go
+++ b/vendor/github.com/docker/docker/api/types/network/network.go
@@ -1,4 +1,4 @@
-package network // import "github.com/docker/docker/api/types/network"
+package network
import (
"time"
diff --git a/vendor/github.com/docker/docker/api/types/plugin_responses.go b/vendor/github.com/docker/docker/api/types/plugin_responses.go
index 60d1fb5..18f743f 100644
--- a/vendor/github.com/docker/docker/api/types/plugin_responses.go
+++ b/vendor/github.com/docker/docker/api/types/plugin_responses.go
@@ -1,4 +1,4 @@
-package types // import "github.com/docker/docker/api/types"
+package types
import (
"encoding/json"
diff --git a/vendor/github.com/docker/docker/api/types/registry/authconfig.go b/vendor/github.com/docker/docker/api/types/registry/authconfig.go
index ebd5e4b..70f7320 100644
--- a/vendor/github.com/docker/docker/api/types/registry/authconfig.go
+++ b/vendor/github.com/docker/docker/api/types/registry/authconfig.go
@@ -1,4 +1,5 @@
-package registry // import "github.com/docker/docker/api/types/registry"
+package registry
+
import (
"context"
"encoding/base64"
diff --git a/vendor/github.com/docker/docker/api/types/registry/authenticate.go b/vendor/github.com/docker/docker/api/types/registry/authenticate.go
index f0a2113..42cac44 100644
--- a/vendor/github.com/docker/docker/api/types/registry/authenticate.go
+++ b/vendor/github.com/docker/docker/api/types/registry/authenticate.go
@@ -1,4 +1,4 @@
-package registry // import "github.com/docker/docker/api/types/registry"
+package registry
// ----------------------------------------------------------------------------
// DO NOT EDIT THIS FILE
diff --git a/vendor/github.com/docker/docker/api/types/registry/registry.go b/vendor/github.com/docker/docker/api/types/registry/registry.go
index 14c82aa..9319c96 100644
--- a/vendor/github.com/docker/docker/api/types/registry/registry.go
+++ b/vendor/github.com/docker/docker/api/types/registry/registry.go
@@ -1,7 +1,7 @@
// FIXME(thaJeztah): remove once we are a module; the go:build directive prevents go from downgrading language version to go1.16:
//go:build go1.23
-package registry // import "github.com/docker/docker/api/types/registry"
+package registry
import (
"encoding/json"
diff --git a/vendor/github.com/docker/docker/api/types/strslice/strslice.go b/vendor/github.com/docker/docker/api/types/strslice/strslice.go
index 82921ce..bad493f 100644
--- a/vendor/github.com/docker/docker/api/types/strslice/strslice.go
+++ b/vendor/github.com/docker/docker/api/types/strslice/strslice.go
@@ -1,4 +1,4 @@
-package strslice // import "github.com/docker/docker/api/types/strslice"
+package strslice
import "encoding/json"
diff --git a/vendor/github.com/docker/docker/api/types/swarm/common.go b/vendor/github.com/docker/docker/api/types/swarm/common.go
index 5ded7db..b42812e 100644
--- a/vendor/github.com/docker/docker/api/types/swarm/common.go
+++ b/vendor/github.com/docker/docker/api/types/swarm/common.go
@@ -1,4 +1,4 @@
-package swarm // import "github.com/docker/docker/api/types/swarm"
+package swarm
import (
"strconv"
diff --git a/vendor/github.com/docker/docker/api/types/swarm/config.go b/vendor/github.com/docker/docker/api/types/swarm/config.go
index bdec82f..80a6ffd 100644
--- a/vendor/github.com/docker/docker/api/types/swarm/config.go
+++ b/vendor/github.com/docker/docker/api/types/swarm/config.go
@@ -1,4 +1,4 @@
-package swarm // import "github.com/docker/docker/api/types/swarm"
+package swarm
import (
"os"
diff --git a/vendor/github.com/docker/docker/api/types/swarm/container.go b/vendor/github.com/docker/docker/api/types/swarm/container.go
index 30e3de7..f9416ba 100644
--- a/vendor/github.com/docker/docker/api/types/swarm/container.go
+++ b/vendor/github.com/docker/docker/api/types/swarm/container.go
@@ -1,4 +1,4 @@
-package swarm // import "github.com/docker/docker/api/types/swarm"
+package swarm
import (
"time"
diff --git a/vendor/github.com/docker/docker/api/types/swarm/network.go b/vendor/github.com/docker/docker/api/types/swarm/network.go
index 98ef328..4b88072 100644
--- a/vendor/github.com/docker/docker/api/types/swarm/network.go
+++ b/vendor/github.com/docker/docker/api/types/swarm/network.go
@@ -1,4 +1,4 @@
-package swarm // import "github.com/docker/docker/api/types/swarm"
+package swarm
import (
"github.com/docker/docker/api/types/network"
diff --git a/vendor/github.com/docker/docker/api/types/swarm/node.go b/vendor/github.com/docker/docker/api/types/swarm/node.go
index f175b1b..2018a03 100644
--- a/vendor/github.com/docker/docker/api/types/swarm/node.go
+++ b/vendor/github.com/docker/docker/api/types/swarm/node.go
@@ -1,4 +1,5 @@
-package swarm // import "github.com/docker/docker/api/types/swarm"
+package swarm
+
import "github.com/docker/docker/api/types/filters"
// Node represents a node.
diff --git a/vendor/github.com/docker/docker/api/types/swarm/runtime.go b/vendor/github.com/docker/docker/api/types/swarm/runtime.go
index 0c77403..8a28320 100644
--- a/vendor/github.com/docker/docker/api/types/swarm/runtime.go
+++ b/vendor/github.com/docker/docker/api/types/swarm/runtime.go
@@ -1,4 +1,4 @@
-package swarm // import "github.com/docker/docker/api/types/swarm"
+package swarm
// RuntimeType is the type of runtime used for the TaskSpec
type RuntimeType string
diff --git a/vendor/github.com/docker/docker/api/types/swarm/runtime/gen.go b/vendor/github.com/docker/docker/api/types/swarm/runtime/gen.go
index 292bd7a..90e572c 100644
--- a/vendor/github.com/docker/docker/api/types/swarm/runtime/gen.go
+++ b/vendor/github.com/docker/docker/api/types/swarm/runtime/gen.go
@@ -1,3 +1,3 @@
//go:generate protoc --gogofaster_out=import_path=github.com/docker/docker/api/types/swarm/runtime:. plugin.proto
-package runtime // import "github.com/docker/docker/api/types/swarm/runtime"
+package runtime
diff --git a/vendor/github.com/docker/docker/api/types/swarm/secret.go b/vendor/github.com/docker/docker/api/types/swarm/secret.go
index 248cffa..d9482ab 100644
--- a/vendor/github.com/docker/docker/api/types/swarm/secret.go
+++ b/vendor/github.com/docker/docker/api/types/swarm/secret.go
@@ -1,4 +1,4 @@
-package swarm // import "github.com/docker/docker/api/types/swarm"
+package swarm
import (
"os"
diff --git a/vendor/github.com/docker/docker/api/types/swarm/service.go b/vendor/github.com/docker/docker/api/types/swarm/service.go
index 1d0a9a4..56c660c 100644
--- a/vendor/github.com/docker/docker/api/types/swarm/service.go
+++ b/vendor/github.com/docker/docker/api/types/swarm/service.go
@@ -1,4 +1,4 @@
-package swarm // import "github.com/docker/docker/api/types/swarm"
+package swarm
import (
"time"
diff --git a/vendor/github.com/docker/docker/api/types/swarm/swarm.go b/vendor/github.com/docker/docker/api/types/swarm/swarm.go
index 2711c9e..38f3e66 100644
--- a/vendor/github.com/docker/docker/api/types/swarm/swarm.go
+++ b/vendor/github.com/docker/docker/api/types/swarm/swarm.go
@@ -1,4 +1,4 @@
-package swarm // import "github.com/docker/docker/api/types/swarm"
+package swarm
import (
"time"
diff --git a/vendor/github.com/docker/docker/api/types/swarm/task.go b/vendor/github.com/docker/docker/api/types/swarm/task.go
index 722d1ce..4dc95e8 100644
--- a/vendor/github.com/docker/docker/api/types/swarm/task.go
+++ b/vendor/github.com/docker/docker/api/types/swarm/task.go
@@ -1,4 +1,4 @@
-package swarm // import "github.com/docker/docker/api/types/swarm"
+package swarm
import (
"time"
diff --git a/vendor/github.com/docker/docker/api/types/time/timestamp.go b/vendor/github.com/docker/docker/api/types/time/timestamp.go
index edd1d6e..0e1df38 100644
--- a/vendor/github.com/docker/docker/api/types/time/timestamp.go
+++ b/vendor/github.com/docker/docker/api/types/time/timestamp.go
@@ -1,4 +1,4 @@
-package time // import "github.com/docker/docker/api/types/time"
+package time
import (
"fmt"
diff --git a/vendor/github.com/docker/docker/api/types/types.go b/vendor/github.com/docker/docker/api/types/types.go
index 443cf82..8bbadeb 100644
--- a/vendor/github.com/docker/docker/api/types/types.go
+++ b/vendor/github.com/docker/docker/api/types/types.go
@@ -1,4 +1,4 @@
-package types // import "github.com/docker/docker/api/types"
+package types
import (
"github.com/docker/docker/api/types/build"
diff --git a/vendor/github.com/docker/docker/api/types/versions/compare.go b/vendor/github.com/docker/docker/api/types/versions/compare.go
index 621725a..1a0325c 100644
--- a/vendor/github.com/docker/docker/api/types/versions/compare.go
+++ b/vendor/github.com/docker/docker/api/types/versions/compare.go
@@ -1,4 +1,4 @@
-package versions // import "github.com/docker/docker/api/types/versions"
+package versions
import (
"strconv"
diff --git a/vendor/github.com/docker/docker/api/types/volume/options.go b/vendor/github.com/docker/docker/api/types/volume/options.go
index 0b9645e..875524f 100644
--- a/vendor/github.com/docker/docker/api/types/volume/options.go
+++ b/vendor/github.com/docker/docker/api/types/volume/options.go
@@ -1,4 +1,4 @@
-package volume // import "github.com/docker/docker/api/types/volume"
+package volume
import "github.com/docker/docker/api/types/filters"
diff --git a/vendor/github.com/docker/docker/api/types/volume/volume_update.go b/vendor/github.com/docker/docker/api/types/volume/volume_update.go
index f958f80..c26ed44 100644
--- a/vendor/github.com/docker/docker/api/types/volume/volume_update.go
+++ b/vendor/github.com/docker/docker/api/types/volume/volume_update.go
@@ -1,4 +1,4 @@
-package volume // import "github.com/docker/docker/api/types/volume"
+package volume
// UpdateOptions is configuration to update a Volume with.
type UpdateOptions struct {
diff --git a/vendor/github.com/docker/docker/client/build_cancel.go b/vendor/github.com/docker/docker/client/build_cancel.go
index 51a73cd..a5eeb81 100644
--- a/vendor/github.com/docker/docker/client/build_cancel.go
+++ b/vendor/github.com/docker/docker/client/build_cancel.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/build_prune.go b/vendor/github.com/docker/docker/client/build_prune.go
index db8fad5..6f0f59e 100644
--- a/vendor/github.com/docker/docker/client/build_prune.go
+++ b/vendor/github.com/docker/docker/client/build_prune.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/checkpoint.go b/vendor/github.com/docker/docker/client/checkpoint.go
index f690f7c..d020574 100644
--- a/vendor/github.com/docker/docker/client/checkpoint.go
+++ b/vendor/github.com/docker/docker/client/checkpoint.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/checkpoint_create.go b/vendor/github.com/docker/docker/client/checkpoint_create.go
index 7b06fee..961a5fe 100644
--- a/vendor/github.com/docker/docker/client/checkpoint_create.go
+++ b/vendor/github.com/docker/docker/client/checkpoint_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/checkpoint_delete.go b/vendor/github.com/docker/docker/client/checkpoint_delete.go
index d15162e..4c51b25 100644
--- a/vendor/github.com/docker/docker/client/checkpoint_delete.go
+++ b/vendor/github.com/docker/docker/client/checkpoint_delete.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/checkpoint_list.go b/vendor/github.com/docker/docker/client/checkpoint_list.go
index 9e7963f..8164c76 100644
--- a/vendor/github.com/docker/docker/client/checkpoint_list.go
+++ b/vendor/github.com/docker/docker/client/checkpoint_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/client.go b/vendor/github.com/docker/docker/client/client.go
index cd47f05..d6e014d 100644
--- a/vendor/github.com/docker/docker/client/client.go
+++ b/vendor/github.com/docker/docker/client/client.go
@@ -39,7 +39,7 @@ For example, to list running containers (the equivalent of "docker ps"):
}
}
*/
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/client_interfaces.go b/vendor/github.com/docker/docker/client/client_interfaces.go
index fe4b1af..df7aad4 100644
--- a/vendor/github.com/docker/docker/client/client_interfaces.go
+++ b/vendor/github.com/docker/docker/client/client_interfaces.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/client_unix.go b/vendor/github.com/docker/docker/client/client_unix.go
index 9fe78ea..e5b921b 100644
--- a/vendor/github.com/docker/docker/client/client_unix.go
+++ b/vendor/github.com/docker/docker/client/client_unix.go
@@ -1,6 +1,6 @@
//go:build !windows
-package client // import "github.com/docker/docker/client"
+package client
// DefaultDockerHost defines OS-specific default host if the DOCKER_HOST
// (EnvOverrideHost) environment variable is unset or empty.
diff --git a/vendor/github.com/docker/docker/client/client_windows.go b/vendor/github.com/docker/docker/client/client_windows.go
index 56572d1..19b954b 100644
--- a/vendor/github.com/docker/docker/client/client_windows.go
+++ b/vendor/github.com/docker/docker/client/client_windows.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
// DefaultDockerHost defines OS-specific default host if the DOCKER_HOST
// (EnvOverrideHost) environment variable is unset or empty.
diff --git a/vendor/github.com/docker/docker/client/config_create.go b/vendor/github.com/docker/docker/client/config_create.go
index 1fbfc21..a39168e 100644
--- a/vendor/github.com/docker/docker/client/config_create.go
+++ b/vendor/github.com/docker/docker/client/config_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/config_inspect.go b/vendor/github.com/docker/docker/client/config_inspect.go
index 679a42c..a9f0a8b 100644
--- a/vendor/github.com/docker/docker/client/config_inspect.go
+++ b/vendor/github.com/docker/docker/client/config_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"bytes"
diff --git a/vendor/github.com/docker/docker/client/config_list.go b/vendor/github.com/docker/docker/client/config_list.go
index 67779e9..6f8a1c2 100644
--- a/vendor/github.com/docker/docker/client/config_list.go
+++ b/vendor/github.com/docker/docker/client/config_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/config_remove.go b/vendor/github.com/docker/docker/client/config_remove.go
index a2955c6..99d33b1 100644
--- a/vendor/github.com/docker/docker/client/config_remove.go
+++ b/vendor/github.com/docker/docker/client/config_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import "context"
diff --git a/vendor/github.com/docker/docker/client/config_update.go b/vendor/github.com/docker/docker/client/config_update.go
index ddb219c..9bc137f 100644
--- a/vendor/github.com/docker/docker/client/config_update.go
+++ b/vendor/github.com/docker/docker/client/config_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_attach.go b/vendor/github.com/docker/docker/client/container_attach.go
index 2e7a13e..1fb3493 100644
--- a/vendor/github.com/docker/docker/client/container_attach.go
+++ b/vendor/github.com/docker/docker/client/container_attach.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_commit.go b/vendor/github.com/docker/docker/client/container_commit.go
index 4838ac7..2b5b985 100644
--- a/vendor/github.com/docker/docker/client/container_commit.go
+++ b/vendor/github.com/docker/docker/client/container_commit.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_copy.go b/vendor/github.com/docker/docker/client/container_copy.go
index 39584d3..7c4130d 100644
--- a/vendor/github.com/docker/docker/client/container_copy.go
+++ b/vendor/github.com/docker/docker/client/container_copy.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_create.go b/vendor/github.com/docker/docker/client/container_create.go
index 9bb106f..0625cb1 100644
--- a/vendor/github.com/docker/docker/client/container_create.go
+++ b/vendor/github.com/docker/docker/client/container_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_diff.go b/vendor/github.com/docker/docker/client/container_diff.go
index 5240189..3848e31 100644
--- a/vendor/github.com/docker/docker/client/container_diff.go
+++ b/vendor/github.com/docker/docker/client/container_diff.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_exec.go b/vendor/github.com/docker/docker/client/container_exec.go
index a39ec71..8abbf89 100644
--- a/vendor/github.com/docker/docker/client/container_exec.go
+++ b/vendor/github.com/docker/docker/client/container_exec.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_export.go b/vendor/github.com/docker/docker/client/container_export.go
index 360d527..3fc4d57 100644
--- a/vendor/github.com/docker/docker/client/container_export.go
+++ b/vendor/github.com/docker/docker/client/container_export.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_inspect.go b/vendor/github.com/docker/docker/client/container_inspect.go
index 6000318..18ccdf2 100644
--- a/vendor/github.com/docker/docker/client/container_inspect.go
+++ b/vendor/github.com/docker/docker/client/container_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"bytes"
diff --git a/vendor/github.com/docker/docker/client/container_kill.go b/vendor/github.com/docker/docker/client/container_kill.go
index 22767ae..251ae47 100644
--- a/vendor/github.com/docker/docker/client/container_kill.go
+++ b/vendor/github.com/docker/docker/client/container_kill.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_list.go b/vendor/github.com/docker/docker/client/container_list.go
index 510bcdf..e17b14a 100644
--- a/vendor/github.com/docker/docker/client/container_list.go
+++ b/vendor/github.com/docker/docker/client/container_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_logs.go b/vendor/github.com/docker/docker/client/container_logs.go
index ae30f8d..3ea1f68 100644
--- a/vendor/github.com/docker/docker/client/container_logs.go
+++ b/vendor/github.com/docker/docker/client/container_logs.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_pause.go b/vendor/github.com/docker/docker/client/container_pause.go
index 5cc2984..59b3e2d 100644
--- a/vendor/github.com/docker/docker/client/container_pause.go
+++ b/vendor/github.com/docker/docker/client/container_pause.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import "context"
diff --git a/vendor/github.com/docker/docker/client/container_prune.go b/vendor/github.com/docker/docker/client/container_prune.go
index 3176be5..84fb6bc 100644
--- a/vendor/github.com/docker/docker/client/container_prune.go
+++ b/vendor/github.com/docker/docker/client/container_prune.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_remove.go b/vendor/github.com/docker/docker/client/container_remove.go
index 6661351..b1a2ce6 100644
--- a/vendor/github.com/docker/docker/client/container_remove.go
+++ b/vendor/github.com/docker/docker/client/container_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_rename.go b/vendor/github.com/docker/docker/client/container_rename.go
index 0a09231..4c03022 100644
--- a/vendor/github.com/docker/docker/client/container_rename.go
+++ b/vendor/github.com/docker/docker/client/container_rename.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_resize.go b/vendor/github.com/docker/docker/client/container_resize.go
index 725c08a..56b7368 100644
--- a/vendor/github.com/docker/docker/client/container_resize.go
+++ b/vendor/github.com/docker/docker/client/container_resize.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_restart.go b/vendor/github.com/docker/docker/client/container_restart.go
index 50559ba..5af07bf 100644
--- a/vendor/github.com/docker/docker/client/container_restart.go
+++ b/vendor/github.com/docker/docker/client/container_restart.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_start.go b/vendor/github.com/docker/docker/client/container_start.go
index b81ed3e..c7206e3 100644
--- a/vendor/github.com/docker/docker/client/container_start.go
+++ b/vendor/github.com/docker/docker/client/container_start.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
@@ -15,10 +15,10 @@ func (cli *Client) ContainerStart(ctx context.Context, containerID string, optio
}
query := url.Values{}
- if len(options.CheckpointID) != 0 {
+ if options.CheckpointID != "" {
query.Set("checkpoint", options.CheckpointID)
}
- if len(options.CheckpointDir) != 0 {
+ if options.CheckpointDir != "" {
query.Set("checkpoint-dir", options.CheckpointDir)
}
diff --git a/vendor/github.com/docker/docker/client/container_stats.go b/vendor/github.com/docker/docker/client/container_stats.go
index a66b90c..2244e0f 100644
--- a/vendor/github.com/docker/docker/client/container_stats.go
+++ b/vendor/github.com/docker/docker/client/container_stats.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_stop.go b/vendor/github.com/docker/docker/client/container_stop.go
index eb0129c..175b9c8 100644
--- a/vendor/github.com/docker/docker/client/container_stop.go
+++ b/vendor/github.com/docker/docker/client/container_stop.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_top.go b/vendor/github.com/docker/docker/client/container_top.go
index 12c8b78..5770f9d 100644
--- a/vendor/github.com/docker/docker/client/container_top.go
+++ b/vendor/github.com/docker/docker/client/container_top.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_unpause.go b/vendor/github.com/docker/docker/client/container_unpause.go
index f602549..c95f6e3 100644
--- a/vendor/github.com/docker/docker/client/container_unpause.go
+++ b/vendor/github.com/docker/docker/client/container_unpause.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import "context"
diff --git a/vendor/github.com/docker/docker/client/container_update.go b/vendor/github.com/docker/docker/client/container_update.go
index 7f0cf62..10e966d 100644
--- a/vendor/github.com/docker/docker/client/container_update.go
+++ b/vendor/github.com/docker/docker/client/container_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/container_wait.go b/vendor/github.com/docker/docker/client/container_wait.go
index bda4a9e..75c03a1 100644
--- a/vendor/github.com/docker/docker/client/container_wait.go
+++ b/vendor/github.com/docker/docker/client/container_wait.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"bytes"
diff --git a/vendor/github.com/docker/docker/client/disk_usage.go b/vendor/github.com/docker/docker/client/disk_usage.go
index ed78812..729e105 100644
--- a/vendor/github.com/docker/docker/client/disk_usage.go
+++ b/vendor/github.com/docker/docker/client/disk_usage.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/distribution_inspect.go b/vendor/github.com/docker/docker/client/distribution_inspect.go
index b8654b2..693c412 100644
--- a/vendor/github.com/docker/docker/client/distribution_inspect.go
+++ b/vendor/github.com/docker/docker/client/distribution_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/envvars.go b/vendor/github.com/docker/docker/client/envvars.go
index 61dd45c..abe122d 100644
--- a/vendor/github.com/docker/docker/client/envvars.go
+++ b/vendor/github.com/docker/docker/client/envvars.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
const (
// EnvOverrideHost is the name of the environment variable that can be used
diff --git a/vendor/github.com/docker/docker/client/errors.go b/vendor/github.com/docker/docker/client/errors.go
index 7bd8593..9e3a253 100644
--- a/vendor/github.com/docker/docker/client/errors.go
+++ b/vendor/github.com/docker/docker/client/errors.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/events.go b/vendor/github.com/docker/docker/client/events.go
index c71d2a0..498fe46 100644
--- a/vendor/github.com/docker/docker/client/events.go
+++ b/vendor/github.com/docker/docker/client/events.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/hijack.go b/vendor/github.com/docker/docker/client/hijack.go
index 2c78fad..01d121a 100644
--- a/vendor/github.com/docker/docker/client/hijack.go
+++ b/vendor/github.com/docker/docker/client/hijack.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"bufio"
@@ -40,7 +40,7 @@ func (cli *Client) postHijacked(ctx context.Context, path string, query url.Valu
// DialHijack returns a hijacked connection with negotiated protocol proto.
func (cli *Client) DialHijack(ctx context.Context, url, proto string, meta map[string][]string) (net.Conn, error) {
- req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, nil)
+ req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, http.NoBody)
if err != nil {
return nil, err
}
diff --git a/vendor/github.com/docker/docker/client/image_build.go b/vendor/github.com/docker/docker/client/image_build.go
index 28b74a3..66ca75e 100644
--- a/vendor/github.com/docker/docker/client/image_build.go
+++ b/vendor/github.com/docker/docker/client/image_build.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/image_create.go b/vendor/github.com/docker/docker/client/image_create.go
index 1aa061e..1e044d7 100644
--- a/vendor/github.com/docker/docker/client/image_create.go
+++ b/vendor/github.com/docker/docker/client/image_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/image_history.go b/vendor/github.com/docker/docker/client/image_history.go
index 49381fb..fce8b80 100644
--- a/vendor/github.com/docker/docker/client/image_history.go
+++ b/vendor/github.com/docker/docker/client/image_history.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/image_import.go b/vendor/github.com/docker/docker/client/image_import.go
index 5849d85..5236dbc 100644
--- a/vendor/github.com/docker/docker/client/image_import.go
+++ b/vendor/github.com/docker/docker/client/image_import.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/image_inspect.go b/vendor/github.com/docker/docker/client/image_inspect.go
index d88f0f1..4c35003 100644
--- a/vendor/github.com/docker/docker/client/image_inspect.go
+++ b/vendor/github.com/docker/docker/client/image_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"bytes"
diff --git a/vendor/github.com/docker/docker/client/image_list.go b/vendor/github.com/docker/docker/client/image_list.go
index e1911eb..ec0a2ad 100644
--- a/vendor/github.com/docker/docker/client/image_list.go
+++ b/vendor/github.com/docker/docker/client/image_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/image_load.go b/vendor/github.com/docker/docker/client/image_load.go
index d83877d..079002e 100644
--- a/vendor/github.com/docker/docker/client/image_load.go
+++ b/vendor/github.com/docker/docker/client/image_load.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/image_prune.go b/vendor/github.com/docker/docker/client/image_prune.go
index 7c354d7..52e8bcf 100644
--- a/vendor/github.com/docker/docker/client/image_prune.go
+++ b/vendor/github.com/docker/docker/client/image_prune.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/image_pull.go b/vendor/github.com/docker/docker/client/image_pull.go
index ae8c807..ab7606b 100644
--- a/vendor/github.com/docker/docker/client/image_pull.go
+++ b/vendor/github.com/docker/docker/client/image_pull.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/image_push.go b/vendor/github.com/docker/docker/client/image_push.go
index 5210304..cbbe9a2 100644
--- a/vendor/github.com/docker/docker/client/image_push.go
+++ b/vendor/github.com/docker/docker/client/image_push.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/image_remove.go b/vendor/github.com/docker/docker/client/image_remove.go
index 0d76913..8f357c7 100644
--- a/vendor/github.com/docker/docker/client/image_remove.go
+++ b/vendor/github.com/docker/docker/client/image_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/image_save.go b/vendor/github.com/docker/docker/client/image_save.go
index 0aa7177..d2102be 100644
--- a/vendor/github.com/docker/docker/client/image_save.go
+++ b/vendor/github.com/docker/docker/client/image_save.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/image_search.go b/vendor/github.com/docker/docker/client/image_search.go
index f3aab43..8f5343b 100644
--- a/vendor/github.com/docker/docker/client/image_search.go
+++ b/vendor/github.com/docker/docker/client/image_search.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/image_tag.go b/vendor/github.com/docker/docker/client/image_tag.go
index 25c7360..2bfafc5 100644
--- a/vendor/github.com/docker/docker/client/image_tag.go
+++ b/vendor/github.com/docker/docker/client/image_tag.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/info.go b/vendor/github.com/docker/docker/client/info.go
index 6396f4b..ed85d7f 100644
--- a/vendor/github.com/docker/docker/client/info.go
+++ b/vendor/github.com/docker/docker/client/info.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/login.go b/vendor/github.com/docker/docker/client/login.go
index d3572c1..2d7f179 100644
--- a/vendor/github.com/docker/docker/client/login.go
+++ b/vendor/github.com/docker/docker/client/login.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/network_connect.go b/vendor/github.com/docker/docker/client/network_connect.go
index fa7cc34..f7526c5 100644
--- a/vendor/github.com/docker/docker/client/network_connect.go
+++ b/vendor/github.com/docker/docker/client/network_connect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/network_create.go b/vendor/github.com/docker/docker/client/network_create.go
index eef9514..6a7f2ea 100644
--- a/vendor/github.com/docker/docker/client/network_create.go
+++ b/vendor/github.com/docker/docker/client/network_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/network_disconnect.go b/vendor/github.com/docker/docker/client/network_disconnect.go
index d8051df..55f9b6a20 100644
--- a/vendor/github.com/docker/docker/client/network_disconnect.go
+++ b/vendor/github.com/docker/docker/client/network_disconnect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/network_inspect.go b/vendor/github.com/docker/docker/client/network_inspect.go
index 1387c08..734ec10 100644
--- a/vendor/github.com/docker/docker/client/network_inspect.go
+++ b/vendor/github.com/docker/docker/client/network_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"bytes"
diff --git a/vendor/github.com/docker/docker/client/network_list.go b/vendor/github.com/docker/docker/client/network_list.go
index e1b4fca..8d93361 100644
--- a/vendor/github.com/docker/docker/client/network_list.go
+++ b/vendor/github.com/docker/docker/client/network_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/network_prune.go b/vendor/github.com/docker/docker/client/network_prune.go
index 90d3679..7835fe9 100644
--- a/vendor/github.com/docker/docker/client/network_prune.go
+++ b/vendor/github.com/docker/docker/client/network_prune.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/network_remove.go b/vendor/github.com/docker/docker/client/network_remove.go
index 89fdaaf..9b164d3 100644
--- a/vendor/github.com/docker/docker/client/network_remove.go
+++ b/vendor/github.com/docker/docker/client/network_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import "context"
diff --git a/vendor/github.com/docker/docker/client/node_inspect.go b/vendor/github.com/docker/docker/client/node_inspect.go
index 5d3343d..dd1f1f8 100644
--- a/vendor/github.com/docker/docker/client/node_inspect.go
+++ b/vendor/github.com/docker/docker/client/node_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"bytes"
diff --git a/vendor/github.com/docker/docker/client/node_list.go b/vendor/github.com/docker/docker/client/node_list.go
index 429eec2..3b393ff 100644
--- a/vendor/github.com/docker/docker/client/node_list.go
+++ b/vendor/github.com/docker/docker/client/node_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/node_remove.go b/vendor/github.com/docker/docker/client/node_remove.go
index 07d8e65..644fe13 100644
--- a/vendor/github.com/docker/docker/client/node_remove.go
+++ b/vendor/github.com/docker/docker/client/node_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/node_update.go b/vendor/github.com/docker/docker/client/node_update.go
index 10e2186..62af964 100644
--- a/vendor/github.com/docker/docker/client/node_update.go
+++ b/vendor/github.com/docker/docker/client/node_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/ping.go b/vendor/github.com/docker/docker/client/ping.go
index 2ffa594..385fdf0 100644
--- a/vendor/github.com/docker/docker/client/ping.go
+++ b/vendor/github.com/docker/docker/client/ping.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/plugin_create.go b/vendor/github.com/docker/docker/client/plugin_create.go
index b95dbaf..eaba7ee 100644
--- a/vendor/github.com/docker/docker/client/plugin_create.go
+++ b/vendor/github.com/docker/docker/client/plugin_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/plugin_disable.go b/vendor/github.com/docker/docker/client/plugin_disable.go
index 9fabe77..4049b1b 100644
--- a/vendor/github.com/docker/docker/client/plugin_disable.go
+++ b/vendor/github.com/docker/docker/client/plugin_disable.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/plugin_enable.go b/vendor/github.com/docker/docker/client/plugin_enable.go
index 492d0bc..6118569 100644
--- a/vendor/github.com/docker/docker/client/plugin_enable.go
+++ b/vendor/github.com/docker/docker/client/plugin_enable.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/plugin_inspect.go b/vendor/github.com/docker/docker/client/plugin_inspect.go
index 8f107a7..eaedeb8 100644
--- a/vendor/github.com/docker/docker/client/plugin_inspect.go
+++ b/vendor/github.com/docker/docker/client/plugin_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"bytes"
diff --git a/vendor/github.com/docker/docker/client/plugin_install.go b/vendor/github.com/docker/docker/client/plugin_install.go
index 8553961..5fd2ff2 100644
--- a/vendor/github.com/docker/docker/client/plugin_install.go
+++ b/vendor/github.com/docker/docker/client/plugin_install.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/plugin_list.go b/vendor/github.com/docker/docker/client/plugin_list.go
index 03bcf76..f314e17 100644
--- a/vendor/github.com/docker/docker/client/plugin_list.go
+++ b/vendor/github.com/docker/docker/client/plugin_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/plugin_push.go b/vendor/github.com/docker/docker/client/plugin_push.go
index da15e44..4574dcd 100644
--- a/vendor/github.com/docker/docker/client/plugin_push.go
+++ b/vendor/github.com/docker/docker/client/plugin_push.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/plugin_remove.go b/vendor/github.com/docker/docker/client/plugin_remove.go
index 6ee107e..2ba0a8c 100644
--- a/vendor/github.com/docker/docker/client/plugin_remove.go
+++ b/vendor/github.com/docker/docker/client/plugin_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/plugin_set.go b/vendor/github.com/docker/docker/client/plugin_set.go
index e2a7983..f0e4a0c 100644
--- a/vendor/github.com/docker/docker/client/plugin_set.go
+++ b/vendor/github.com/docker/docker/client/plugin_set.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/plugin_upgrade.go b/vendor/github.com/docker/docker/client/plugin_upgrade.go
index 4abb29c..cd0cf4d 100644
--- a/vendor/github.com/docker/docker/client/plugin_upgrade.go
+++ b/vendor/github.com/docker/docker/client/plugin_upgrade.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/request.go b/vendor/github.com/docker/docker/client/request.go
index d9074a7..254138f 100644
--- a/vendor/github.com/docker/docker/client/request.go
+++ b/vendor/github.com/docker/docker/client/request.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"bytes"
diff --git a/vendor/github.com/docker/docker/client/secret_create.go b/vendor/github.com/docker/docker/client/secret_create.go
index aee051b..be4a1da 100644
--- a/vendor/github.com/docker/docker/client/secret_create.go
+++ b/vendor/github.com/docker/docker/client/secret_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/secret_inspect.go b/vendor/github.com/docker/docker/client/secret_inspect.go
index fdabc19..f44c00e 100644
--- a/vendor/github.com/docker/docker/client/secret_inspect.go
+++ b/vendor/github.com/docker/docker/client/secret_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"bytes"
diff --git a/vendor/github.com/docker/docker/client/secret_list.go b/vendor/github.com/docker/docker/client/secret_list.go
index b158d99..2e37bda 100644
--- a/vendor/github.com/docker/docker/client/secret_list.go
+++ b/vendor/github.com/docker/docker/client/secret_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/secret_remove.go b/vendor/github.com/docker/docker/client/secret_remove.go
index 7ea2acb..d1044aa 100644
--- a/vendor/github.com/docker/docker/client/secret_remove.go
+++ b/vendor/github.com/docker/docker/client/secret_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import "context"
diff --git a/vendor/github.com/docker/docker/client/secret_update.go b/vendor/github.com/docker/docker/client/secret_update.go
index 60d21a6..a0aff7c 100644
--- a/vendor/github.com/docker/docker/client/secret_update.go
+++ b/vendor/github.com/docker/docker/client/secret_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/service_create.go b/vendor/github.com/docker/docker/client/service_create.go
index 6b9932a..db7566a 100644
--- a/vendor/github.com/docker/docker/client/service_create.go
+++ b/vendor/github.com/docker/docker/client/service_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/service_inspect.go b/vendor/github.com/docker/docker/client/service_inspect.go
index 892e900..cb25ade 100644
--- a/vendor/github.com/docker/docker/client/service_inspect.go
+++ b/vendor/github.com/docker/docker/client/service_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"bytes"
diff --git a/vendor/github.com/docker/docker/client/service_list.go b/vendor/github.com/docker/docker/client/service_list.go
index 019873b..26b25ff 100644
--- a/vendor/github.com/docker/docker/client/service_list.go
+++ b/vendor/github.com/docker/docker/client/service_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/service_logs.go b/vendor/github.com/docker/docker/client/service_logs.go
index 6e0cbee..8bf0408 100644
--- a/vendor/github.com/docker/docker/client/service_logs.go
+++ b/vendor/github.com/docker/docker/client/service_logs.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/service_remove.go b/vendor/github.com/docker/docker/client/service_remove.go
index 93c949e..0c7cc57 100644
--- a/vendor/github.com/docker/docker/client/service_remove.go
+++ b/vendor/github.com/docker/docker/client/service_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import "context"
diff --git a/vendor/github.com/docker/docker/client/service_update.go b/vendor/github.com/docker/docker/client/service_update.go
index e0c1a26..278e305 100644
--- a/vendor/github.com/docker/docker/client/service_update.go
+++ b/vendor/github.com/docker/docker/client/service_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/swarm_get_unlock_key.go b/vendor/github.com/docker/docker/client/swarm_get_unlock_key.go
index 6e30daf..41151f6 100644
--- a/vendor/github.com/docker/docker/client/swarm_get_unlock_key.go
+++ b/vendor/github.com/docker/docker/client/swarm_get_unlock_key.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/swarm_init.go b/vendor/github.com/docker/docker/client/swarm_init.go
index 3dcb2a5..7f29165 100644
--- a/vendor/github.com/docker/docker/client/swarm_init.go
+++ b/vendor/github.com/docker/docker/client/swarm_init.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/swarm_inspect.go b/vendor/github.com/docker/docker/client/swarm_inspect.go
index 3d5a8a0..597693b 100644
--- a/vendor/github.com/docker/docker/client/swarm_inspect.go
+++ b/vendor/github.com/docker/docker/client/swarm_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/swarm_join.go b/vendor/github.com/docker/docker/client/swarm_join.go
index a1cf045..446d4d0 100644
--- a/vendor/github.com/docker/docker/client/swarm_join.go
+++ b/vendor/github.com/docker/docker/client/swarm_join.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/swarm_leave.go b/vendor/github.com/docker/docker/client/swarm_leave.go
index 90ca84b..709e5ad 100644
--- a/vendor/github.com/docker/docker/client/swarm_leave.go
+++ b/vendor/github.com/docker/docker/client/swarm_leave.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/swarm_unlock.go b/vendor/github.com/docker/docker/client/swarm_unlock.go
index 745d64d..e3c756b 100644
--- a/vendor/github.com/docker/docker/client/swarm_unlock.go
+++ b/vendor/github.com/docker/docker/client/swarm_unlock.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/swarm_update.go b/vendor/github.com/docker/docker/client/swarm_update.go
index 9fde7d7..309ab19 100644
--- a/vendor/github.com/docker/docker/client/swarm_update.go
+++ b/vendor/github.com/docker/docker/client/swarm_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/task_inspect.go b/vendor/github.com/docker/docker/client/task_inspect.go
index 37668bd..ca3924f 100644
--- a/vendor/github.com/docker/docker/client/task_inspect.go
+++ b/vendor/github.com/docker/docker/client/task_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"bytes"
diff --git a/vendor/github.com/docker/docker/client/task_list.go b/vendor/github.com/docker/docker/client/task_list.go
index 5d540c3..de743e9 100644
--- a/vendor/github.com/docker/docker/client/task_list.go
+++ b/vendor/github.com/docker/docker/client/task_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/task_logs.go b/vendor/github.com/docker/docker/client/task_logs.go
index 9dcb977..baa5552 100644
--- a/vendor/github.com/docker/docker/client/task_logs.go
+++ b/vendor/github.com/docker/docker/client/task_logs.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/utils.go b/vendor/github.com/docker/docker/client/utils.go
index 27f2b98..67e1e69 100644
--- a/vendor/github.com/docker/docker/client/utils.go
+++ b/vendor/github.com/docker/docker/client/utils.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"encoding/json"
@@ -25,7 +25,7 @@ func (e emptyIDError) Error() string {
// trimID trims the given object-ID / name, returning an error if it's empty.
func trimID(objType, id string) (string, error) {
id = strings.TrimSpace(id)
- if len(id) == 0 {
+ if id == "" {
return "", emptyIDError(objType)
}
return id, nil
diff --git a/vendor/github.com/docker/docker/client/version.go b/vendor/github.com/docker/docker/client/version.go
index 4566fd9..046af16 100644
--- a/vendor/github.com/docker/docker/client/version.go
+++ b/vendor/github.com/docker/docker/client/version.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/volume_create.go b/vendor/github.com/docker/docker/client/volume_create.go
index bedb3ab..1aad3f4 100644
--- a/vendor/github.com/docker/docker/client/volume_create.go
+++ b/vendor/github.com/docker/docker/client/volume_create.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/volume_inspect.go b/vendor/github.com/docker/docker/client/volume_inspect.go
index ce32bbb..389a4a7 100644
--- a/vendor/github.com/docker/docker/client/volume_inspect.go
+++ b/vendor/github.com/docker/docker/client/volume_inspect.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"bytes"
diff --git a/vendor/github.com/docker/docker/client/volume_list.go b/vendor/github.com/docker/docker/client/volume_list.go
index de6ce23..61ed518 100644
--- a/vendor/github.com/docker/docker/client/volume_list.go
+++ b/vendor/github.com/docker/docker/client/volume_list.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/volume_prune.go b/vendor/github.com/docker/docker/client/volume_prune.go
index 7da148f..e22f007 100644
--- a/vendor/github.com/docker/docker/client/volume_prune.go
+++ b/vendor/github.com/docker/docker/client/volume_prune.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/volume_remove.go b/vendor/github.com/docker/docker/client/volume_remove.go
index eefd9ce..e2a53fa 100644
--- a/vendor/github.com/docker/docker/client/volume_remove.go
+++ b/vendor/github.com/docker/docker/client/volume_remove.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/client/volume_update.go b/vendor/github.com/docker/docker/client/volume_update.go
index c91d5e9..879932f 100644
--- a/vendor/github.com/docker/docker/client/volume_update.go
+++ b/vendor/github.com/docker/docker/client/volume_update.go
@@ -1,4 +1,4 @@
-package client // import "github.com/docker/docker/client"
+package client
import (
"context"
diff --git a/vendor/github.com/docker/docker/errdefs/doc.go b/vendor/github.com/docker/docker/errdefs/doc.go
index b8d32eb..efbe8ba 100644
--- a/vendor/github.com/docker/docker/errdefs/doc.go
+++ b/vendor/github.com/docker/docker/errdefs/doc.go
@@ -5,4 +5,4 @@
// To check if a particular error implements one of these interfaces, there are helper
// functions provided (e.g. `Is<SomeError>`) which can be used rather than asserting the interfaces directly.
// If you must assert on these interfaces, be sure to check the causal chain (`err.Unwrap()`).
-package errdefs // import "github.com/docker/docker/errdefs"
+package errdefs
diff --git a/vendor/github.com/docker/docker/pkg/idtools/idtools.go b/vendor/github.com/docker/docker/pkg/idtools/idtools.go
index 23e90c2..982f81d 100644
--- a/vendor/github.com/docker/docker/pkg/idtools/idtools.go
+++ b/vendor/github.com/docker/docker/pkg/idtools/idtools.go
@@ -108,12 +108,16 @@ type Identity struct {
}
// Chown changes the numeric uid and gid of the named file to id.UID and id.GID.
+//
+// Deprecated: this method is deprecated and will be removed in the next release.
func (id Identity) Chown(name string) error {
return os.Chown(name, id.UID, id.GID)
}
// IdentityMapping contains a mappings of UIDs and GIDs.
// The zero value represents an empty mapping.
+//
+// Deprecated: this type is deprecated and will be removed in the next release.
type IdentityMapping struct {
UIDMaps []IDMap `json:"UIDMaps"`
GIDMaps []IDMap `json:"GIDMaps"`
diff --git a/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go b/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go
index 1a05de4..3d07280 100644
--- a/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go
+++ b/vendor/github.com/docker/docker/pkg/jsonmessage/jsonmessage.go
@@ -1,4 +1,4 @@
-package jsonmessage // import "github.com/docker/docker/pkg/jsonmessage"
+package jsonmessage
import (
"encoding/json"
diff --git a/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go b/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go
index d437613..611432a 100644
--- a/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go
+++ b/vendor/github.com/docker/docker/pkg/stdcopy/stdcopy.go
@@ -1,4 +1,4 @@
-package stdcopy // import "github.com/docker/docker/pkg/stdcopy"
+package stdcopy
import (
"bytes"
@@ -107,7 +107,7 @@ func StdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, _ error) {
var nr2 int
nr2, err = src.Read(buf[nr:])
nr += nr2
- if err == io.EOF {
+ if errors.Is(err, io.EOF) {
if nr < stdWriterPrefixLen {
return written, nil
}
@@ -153,7 +153,7 @@ func StdCopy(dstout, dsterr io.Writer, src io.Reader) (written int64, _ error) {
var nr2 int
nr2, err = src.Read(buf[nr:])
nr += nr2
- if err == io.EOF {
+ if errors.Is(err, io.EOF) {
if nr < frameSize+stdWriterPrefixLen {
return written, nil
}
diff --git a/vendor/github.com/go-jose/go-jose/v4/jwe.go b/vendor/github.com/go-jose/go-jose/v4/jwe.go
index 9f1322d..6102f91 100644
--- a/vendor/github.com/go-jose/go-jose/v4/jwe.go
+++ b/vendor/github.com/go-jose/go-jose/v4/jwe.go
@@ -274,7 +274,7 @@ func validateAlgEnc(headers rawHeader, keyAlgorithms []KeyAlgorithm, contentEncr
if alg != "" && !containsKeyAlgorithm(keyAlgorithms, alg) {
return fmt.Errorf("unexpected key algorithm %q; expected %q", alg, keyAlgorithms)
}
- if alg != "" && !containsContentEncryption(contentEncryption, enc) {
+ if enc != "" && !containsContentEncryption(contentEncryption, enc) {
return fmt.Errorf("unexpected content encryption algorithm %q; expected %q", enc, contentEncryption)
}
return nil
@@ -288,11 +288,20 @@ func ParseEncryptedCompact(
keyAlgorithms []KeyAlgorithm,
contentEncryption []ContentEncryption,
) (*JSONWebEncryption, error) {
- // Five parts is four separators
- if strings.Count(input, ".") != 4 {
- return nil, fmt.Errorf("go-jose/go-jose: compact JWE format must have five parts")
+ var parts [5]string
+ var ok bool
+
+ for i := range 4 {
+ parts[i], input, ok = strings.Cut(input, ".")
+ if !ok {
+ return nil, errors.New("go-jose/go-jose: compact JWE format must have five parts")
+ }
+ }
+ // Validate that the last part does not contain more dots
+ if strings.ContainsRune(input, '.') {
+ return nil, errors.New("go-jose/go-jose: compact JWE format must have five parts")
}
- parts := strings.SplitN(input, ".", 5)
+ parts[4] = input
rawProtected, err := base64.RawURLEncoding.DecodeString(parts[0])
if err != nil {
diff --git a/vendor/github.com/go-jose/go-jose/v4/jwk.go b/vendor/github.com/go-jose/go-jose/v4/jwk.go
index 9e57e93..9700f89 100644
--- a/vendor/github.com/go-jose/go-jose/v4/jwk.go
+++ b/vendor/github.com/go-jose/go-jose/v4/jwk.go
@@ -239,7 +239,7 @@ func (k *JSONWebKey) UnmarshalJSON(data []byte) (err error) {
keyPub = key
}
} else {
- return fmt.Errorf("go-jose/go-jose: unknown curve %s'", raw.Crv)
+ return fmt.Errorf("go-jose/go-jose: unknown curve '%s'", raw.Crv)
}
default:
return fmt.Errorf("go-jose/go-jose: unknown json web key type '%s'", raw.Kty)
diff --git a/vendor/github.com/go-jose/go-jose/v4/jws.go b/vendor/github.com/go-jose/go-jose/v4/jws.go
index be2b733..c40bd3e 100644
--- a/vendor/github.com/go-jose/go-jose/v4/jws.go
+++ b/vendor/github.com/go-jose/go-jose/v4/jws.go
@@ -361,35 +361,43 @@ func (parsed *rawJSONWebSignature) sanitized(signatureAlgorithms []SignatureAlgo
return obj, nil
}
+const tokenDelim = "."
+
// parseSignedCompact parses a message in compact format.
func parseSignedCompact(
input string,
payload []byte,
signatureAlgorithms []SignatureAlgorithm,
) (*JSONWebSignature, error) {
- // Three parts is two separators
- if strings.Count(input, ".") != 2 {
+ protected, s, ok := strings.Cut(input, tokenDelim)
+ if !ok { // no period found
+ return nil, fmt.Errorf("go-jose/go-jose: compact JWS format must have three parts")
+ }
+ claims, sig, ok := strings.Cut(s, tokenDelim)
+ if !ok { // only one period found
+ return nil, fmt.Errorf("go-jose/go-jose: compact JWS format must have three parts")
+ }
+ if strings.ContainsRune(sig, '.') { // too many periods found
return nil, fmt.Errorf("go-jose/go-jose: compact JWS format must have three parts")
}
- parts := strings.SplitN(input, ".", 3)
- if parts[1] != "" && payload != nil {
+ if claims != "" && payload != nil {
return nil, fmt.Errorf("go-jose/go-jose: payload is not detached")
}
- rawProtected, err := base64.RawURLEncoding.DecodeString(parts[0])
+ rawProtected, err := base64.RawURLEncoding.DecodeString(protected)
if err != nil {
return nil, err
}
if payload == nil {
- payload, err = base64.RawURLEncoding.DecodeString(parts[1])
+ payload, err = base64.RawURLEncoding.DecodeString(claims)
if err != nil {
return nil, err
}
}
- signature, err := base64.RawURLEncoding.DecodeString(parts[2])
+ signature, err := base64.RawURLEncoding.DecodeString(sig)
if err != nil {
return nil, err
}
diff --git a/vendor/github.com/go-jose/go-jose/v4/symmetric.go b/vendor/github.com/go-jose/go-jose/v4/symmetric.go
index 09efefb..6176e06 100644
--- a/vendor/github.com/go-jose/go-jose/v4/symmetric.go
+++ b/vendor/github.com/go-jose/go-jose/v4/symmetric.go
@@ -21,7 +21,6 @@ import (
"crypto/aes"
"crypto/cipher"
"crypto/hmac"
- "crypto/pbkdf2"
"crypto/rand"
"crypto/sha256"
"crypto/sha512"
@@ -329,7 +328,7 @@ func (ctx *symmetricKeyCipher) encryptKey(cek []byte, alg KeyAlgorithm) (recipie
// derive key
keyLen, h := getPbkdf2Params(alg)
- key, err := pbkdf2.Key(h, string(ctx.key), salt, ctx.p2c, keyLen)
+ key, err := pbkdf2Key(h, string(ctx.key), salt, ctx.p2c, keyLen)
if err != nil {
return recipientInfo{}, nil
}
@@ -434,7 +433,7 @@ func (ctx *symmetricKeyCipher) decryptKey(headers rawHeader, recipient *recipien
// derive key
keyLen, h := getPbkdf2Params(alg)
- key, err := pbkdf2.Key(h, string(ctx.key), salt, p2c, keyLen)
+ key, err := pbkdf2Key(h, string(ctx.key), salt, p2c, keyLen)
if err != nil {
return nil, err
}
diff --git a/vendor/github.com/go-jose/go-jose/v4/symmetric_go124.go b/vendor/github.com/go-jose/go-jose/v4/symmetric_go124.go
new file mode 100644
index 0000000..6c5a4e7
--- /dev/null
+++ b/vendor/github.com/go-jose/go-jose/v4/symmetric_go124.go
@@ -0,0 +1,28 @@
+//go:build go1.24
+
+/*-
+ * Copyright 2014 Square Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jose
+
+import (
+ "crypto/pbkdf2"
+ "hash"
+)
+
+func pbkdf2Key(h func() hash.Hash, password string, salt []byte, iter, keyLen int) ([]byte, error) {
+ return pbkdf2.Key(h, password, salt, iter, keyLen)
+}
diff --git a/vendor/github.com/go-jose/go-jose/v4/symmetric_legacy.go b/vendor/github.com/go-jose/go-jose/v4/symmetric_legacy.go
new file mode 100644
index 0000000..bdfc3d7
--- /dev/null
+++ b/vendor/github.com/go-jose/go-jose/v4/symmetric_legacy.go
@@ -0,0 +1,29 @@
+//go:build !go1.24
+
+/*-
+ * Copyright 2014 Square Inc.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package jose
+
+import (
+ "hash"
+
+ "golang.org/x/crypto/pbkdf2"
+)
+
+func pbkdf2Key(h func() hash.Hash, password string, salt []byte, iter, keyLen int) ([]byte, error) {
+ return pbkdf2.Key([]byte(password), salt, iter, keyLen, h), nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_linux.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_linux.go
index a3c60ff..c6ec17e 100644
--- a/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_linux.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_linux.go
@@ -135,7 +135,7 @@ func finishCPUInfo(ctx context.Context, c *InfoStat) {
var err error
var value float64
- if len(c.CoreID) == 0 {
+ if c.CoreID == "" {
lines, err = common.ReadLines(sysCPUPath(ctx, c.CPU, "topology/core_id"))
if err == nil {
c.CoreID = lines[0]
diff --git a/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_solaris.go b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_solaris.go
index 3dcea89..9494e3c 100644
--- a/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_solaris.go
+++ b/vendor/github.com/shirou/gopsutil/v4/cpu/cpu_solaris.go
@@ -140,8 +140,8 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
}
result := make([]InfoStat, 0, len(flags))
- for _, proc := range procs {
- procWithFlags := proc
+ for i := range procs {
+ procWithFlags := procs[i]
procWithFlags.Flags = flags
result = append(result, procWithFlags)
}
@@ -149,7 +149,7 @@ func InfoWithContext(ctx context.Context) ([]InfoStat, error) {
return result, nil
}
-var flagsMatch = regexp.MustCompile(`[\w\.]+`)
+var flagsMatch = regexp.MustCompile(`[\w.]+`)
func parseISAInfo(cmdOutput string) ([]string, error) {
words := flagsMatch.FindAllString(cmdOutput, -1)
diff --git a/vendor/github.com/shirou/gopsutil/v4/internal/common/common.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/common.go
index 4f9b2f7..d48b41e 100644
--- a/vendor/github.com/shirou/gopsutil/v4/internal/common/common.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/common.go
@@ -115,7 +115,7 @@ func ReadLines(filename string) ([]string, error) {
}
// ReadLine reads a file and returns the first occurrence of a line that is prefixed with prefix.
-func ReadLine(filename string, prefix string) (string, error) {
+func ReadLine(filename, prefix string) (string, error) {
f, err := os.Open(filename)
if err != nil {
return "", err
@@ -156,7 +156,7 @@ func ReadLinesOffsetN(filename string, offset uint, n int) ([]string, error) {
for i := uint(0); i < uint(n)+offset || n < 0; i++ {
line, err := r.ReadString('\n')
if err != nil {
- if err == io.EOF && len(line) > 0 {
+ if err == io.EOF && line != "" {
ret = append(ret, strings.Trim(line, "\n"))
}
break
@@ -349,7 +349,7 @@ func PathExistsWithContents(filename string) bool {
// GetEnvWithContext retrieves the environment variable key. If it does not exist it returns the default.
// The context may optionally contain a map superseding os.EnvKey.
-func GetEnvWithContext(ctx context.Context, key string, dfault string, combineWith ...string) string {
+func GetEnvWithContext(ctx context.Context, key, dfault string, combineWith ...string) string {
var value string
if env, ok := ctx.Value(common.EnvKey).(common.EnvMap); ok {
value = env[common.EnvKeyType(key)]
@@ -365,7 +365,7 @@ func GetEnvWithContext(ctx context.Context, key string, dfault string, combineWi
}
// GetEnv retrieves the environment variable key. If it does not exist it returns the default.
-func GetEnv(key string, dfault string, combineWith ...string) string {
+func GetEnv(key, dfault string, combineWith ...string) string {
value := os.Getenv(key)
if value == "" {
value = dfault
diff --git a/vendor/github.com/shirou/gopsutil/v4/internal/common/common_linux.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_linux.go
index 04ec171..ffaae42 100644
--- a/vendor/github.com/shirou/gopsutil/v4/internal/common/common_linux.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_linux.go
@@ -317,11 +317,11 @@ func VirtualizationWithContext(ctx context.Context) (string, string, error) {
return system, role, nil
}
-func GetOSRelease() (platform string, version string, err error) {
+func GetOSRelease() (platform, version string, err error) {
return GetOSReleaseWithContext(context.Background())
}
-func GetOSReleaseWithContext(ctx context.Context) (platform string, version string, err error) {
+func GetOSReleaseWithContext(ctx context.Context) (platform, version string, err error) {
contents, err := ReadLines(HostEtcWithContext(ctx, "os-release"))
if err != nil {
return "", "", nil // return empty
diff --git a/vendor/github.com/shirou/gopsutil/v4/internal/common/common_unix.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_unix.go
index c9f91b1..2ccb376 100644
--- a/vendor/github.com/shirou/gopsutil/v4/internal/common/common_unix.go
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/common_unix.go
@@ -33,7 +33,7 @@ func CallLsofWithContext(ctx context.Context, invoke Invoker, pid int32, args ..
var ret []string
for _, l := range lines[1:] {
- if len(l) == 0 {
+ if l == "" {
continue
}
ret = append(ret, l)
diff --git a/vendor/github.com/shirou/gopsutil/v4/internal/common/readlink_linux.go b/vendor/github.com/shirou/gopsutil/v4/internal/common/readlink_linux.go
new file mode 100644
index 0000000..ea2d467
--- /dev/null
+++ b/vendor/github.com/shirou/gopsutil/v4/internal/common/readlink_linux.go
@@ -0,0 +1,53 @@
+package common
+
+import (
+ "errors"
+ "os"
+ "sync"
+ "syscall"
+)
+
+var bufferPool = sync.Pool{
+ New: func() any {
+ b := make([]byte, syscall.PathMax)
+ return &b
+ },
+}
+
+// The following three functions are copied from stdlib.
+
+// ignoringEINTR2 is ignoringEINTR, but returning an additional value.
+func ignoringEINTR2[T any](fn func() (T, error)) (T, error) {
+ for {
+ v, err := fn()
+ if !errors.Is(err, syscall.EINTR) {
+ return v, err
+ }
+ }
+}
+
+// Many functions in package syscall return a count of -1 instead of 0.
+// Using fixCount(call()) instead of call() corrects the count.
+func fixCount(n int, err error) (int, error) {
+ if n < 0 {
+ n = 0
+ }
+ return n, err
+}
+
+// Readlink behaves like os.Readlink but caches the buffer passed to syscall.Readlink.
+func Readlink(name string) (string, error) {
+ b := bufferPool.Get().(*[]byte)
+
+ n, err := ignoringEINTR2(func() (int, error) {
+ return fixCount(syscall.Readlink(name, *b))
+ })
+ if err != nil {
+ bufferPool.Put(b)
+ return "", &os.PathError{Op: "readlink", Path: name, Err: err}
+ }
+
+ result := string((*b)[:n])
+ bufferPool.Put(b)
+ return result, nil
+}
diff --git a/vendor/github.com/shirou/gopsutil/v4/mem/ex_windows.go b/vendor/github.com/shirou/gopsutil/v4/mem/ex_windows.go
index 2d21a80..c1a9ed1 100644
--- a/vendor/github.com/shirou/gopsutil/v4/mem/ex_windows.go
+++ b/vendor/github.com/shirou/gopsutil/v4/mem/ex_windows.go
@@ -11,10 +11,14 @@ import (
// https://learn.microsoft.com/en-us/windows/win32/api/sysinfoapi/ns-sysinfoapi-memorystatusex
// https://learn.microsoft.com/en-us/windows/win32/api/psapi/ns-psapi-performance_information
type ExVirtualMemory struct {
- CommitLimit uint64 `json:"commitLimit"`
- CommitTotal uint64 `json:"commitTotal"`
- VirtualTotal uint64 `json:"virtualTotal"`
- VirtualAvail uint64 `json:"virtualAvail"`
+ CommitLimit uint64 `json:"commitLimit"`
+ CommitTotal uint64 `json:"commitTotal"`
+ VirtualTotal uint64 `json:"virtualTotal"`
+ VirtualAvail uint64 `json:"virtualAvail"`
+ PhysTotal uint64 `json:"physTotal"`
+ PhysAvail uint64 `json:"physAvail"`
+ PageFileTotal uint64 `json:"pageFileTotal"`
+ PageFileAvail uint64 `json:"pageFileAvail"`
}
type ExWindows struct{}
@@ -44,10 +48,14 @@ func (e *ExWindows) VirtualMemory() (*ExVirtualMemory, error) {
}
ret := &ExVirtualMemory{
- CommitLimit: perfInfo.commitLimit * perfInfo.pageSize,
- CommitTotal: perfInfo.commitTotal * perfInfo.pageSize,
- VirtualTotal: memInfo.ullTotalVirtual,
- VirtualAvail: memInfo.ullAvailVirtual,
+ CommitLimit: perfInfo.commitLimit * perfInfo.pageSize,
+ CommitTotal: perfInfo.commitTotal * perfInfo.pageSize,
+ VirtualTotal: memInfo.ullTotalVirtual,
+ VirtualAvail: memInfo.ullAvailVirtual,
+ PhysTotal: memInfo.ullTotalPhys,
+ PhysAvail: memInfo.ullAvailPhys,
+ PageFileTotal: memInfo.ullTotalPageFile,
+ PageFileAvail: memInfo.ullAvailPageFile,
}
return ret, nil
diff --git a/vendor/github.com/shirou/gopsutil/v4/net/net.go b/vendor/github.com/shirou/gopsutil/v4/net/net.go
index 78798c5..1d1f9f0 100644
--- a/vendor/github.com/shirou/gopsutil/v4/net/net.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net.go
@@ -94,7 +94,7 @@ type ConntrackStat struct {
SearchRestart uint32 `json:"searchRestart"` // Conntrack table lookups restarted due to hashtable resizes
}
-func NewConntrackStat(e uint32, s uint32, f uint32, n uint32, inv uint32, ign uint32, del uint32, dlst uint32, ins uint32, insfail uint32, drop uint32, edrop uint32, ie uint32, en uint32, ec uint32, ed uint32, sr uint32) *ConntrackStat {
+func NewConntrackStat(e, s, f, n, inv, ign, del, dlst, ins, insfail, drop, edrop, ie, en, ec, ed, sr uint32) *ConntrackStat {
return &ConntrackStat{
Entries: e,
Searched: s,
@@ -273,7 +273,7 @@ func getIOCountersAll(n []IOCountersStat) []IOCountersStat {
return []IOCountersStat{r}
}
-// NetIOCounters returns network I/O statistics for every network
+// IOCounters returns network I/O statistics for every network
// interface installed on the system. If pernic argument is false,
// return only sum of all information (which name is 'all'). If true,
// every network interface installed on the system is returned
@@ -296,7 +296,7 @@ func ProtoCounters(protocols []string) ([]ProtoCountersStat, error) {
return ProtoCountersWithContext(context.Background(), protocols)
}
-// NetFilterCounters returns iptables conntrack statistics
+// FilterCounters returns iptables conntrack statistics
// the currently in use conntrack count and the max.
// If the file does not exist or is invalid it will return nil.
func FilterCounters() ([]FilterStat, error) {
@@ -349,7 +349,7 @@ func ConnectionsPidMax(kind string, pid int32, maxConn int) ([]ConnectionStat, e
// Pids retunres all pids.
// Note: this is a copy of process_linux.Pids()
-// FIXME: Import process occures import cycle.
+// FIXME: Import process occurs import cycle.
// move to common made other platform breaking. Need consider.
func Pids() ([]int32, error) {
return PidsWithContext(context.Background())
diff --git a/vendor/github.com/shirou/gopsutil/v4/net/net_aix.go b/vendor/github.com/shirou/gopsutil/v4/net/net_aix.go
index a5fa881..d5a93f4 100644
--- a/vendor/github.com/shirou/gopsutil/v4/net/net_aix.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_aix.go
@@ -83,7 +83,7 @@ var portMatch = regexp.MustCompile(`(.*)\.(\d+)$`)
// This function only works for netstat returning addresses with a "."
// before the port (0.0.0.0.22 instead of 0.0.0.0:22).
-func parseNetstatAddr(local string, remote string, family uint32) (laddr Addr, raddr Addr, err error) {
+func parseNetstatAddr(local, remote string, family uint32) (laddr, raddr Addr, err error) {
parse := func(l string) (Addr, error) {
matches := portMatch.FindStringSubmatch(l)
if matches == nil {
@@ -183,7 +183,7 @@ func hasCorrectInetProto(kind, proto string) bool {
return false
}
-func parseNetstatA(output string, kind string) ([]ConnectionStat, error) {
+func parseNetstatA(output, kind string) ([]ConnectionStat, error) {
var ret []ConnectionStat
lines := strings.Split(string(output), "\n")
diff --git a/vendor/github.com/shirou/gopsutil/v4/net/net_linux.go b/vendor/github.com/shirou/gopsutil/v4/net/net_linux.go
index 9697526..f01b04b 100644
--- a/vendor/github.com/shirou/gopsutil/v4/net/net_linux.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_linux.go
@@ -540,7 +540,7 @@ func PidsWithContext(ctx context.Context) ([]int32, error) {
// Note: the following is based off process_linux structs and methods
// we need these to fetch the owner of a process ID
-// FIXME: Import process occures import cycle.
+// FIXME: Import process occurs import cycle.
// see remarks on pids()
type process struct {
Pid int32 `json:"pid"`
@@ -793,7 +793,7 @@ func processUnix(file string, kind netConnectionKindType, inodes map[string][]in
return ret, nil
}
-func updateMap(src map[string][]inodeMap, add map[string][]inodeMap) map[string][]inodeMap {
+func updateMap(src, add map[string][]inodeMap) map[string][]inodeMap {
for key, value := range add {
a, exists := src[key]
if !exists {
diff --git a/vendor/github.com/shirou/gopsutil/v4/net/net_openbsd.go b/vendor/github.com/shirou/gopsutil/v4/net/net_openbsd.go
index 481a276..55087ce 100644
--- a/vendor/github.com/shirou/gopsutil/v4/net/net_openbsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_openbsd.go
@@ -217,7 +217,7 @@ func parseNetstatLine(line string) (ConnectionStat, error) {
return n, nil
}
-func parseNetstatAddr(local string, remote string, family uint32) (laddr Addr, raddr Addr, err error) {
+func parseNetstatAddr(local, remote string, family uint32) (laddr, raddr Addr, err error) {
parse := func(l string) (Addr, error) {
matches := portMatch.FindStringSubmatch(l)
if matches == nil {
@@ -260,11 +260,7 @@ func ConnectionsWithContext(ctx context.Context, kind string) ([]ConnectionStat,
switch strings.ToLower(kind) {
default:
fallthrough
- case "":
- fallthrough
- case "all":
- fallthrough
- case "inet":
+ case "", "all", "inet":
// nothing to add
case "inet4":
args = append(args, "-finet")
diff --git a/vendor/github.com/shirou/gopsutil/v4/net/net_unix.go b/vendor/github.com/shirou/gopsutil/v4/net/net_unix.go
index ae7e9d8..7c5153d 100644
--- a/vendor/github.com/shirou/gopsutil/v4/net/net_unix.go
+++ b/vendor/github.com/shirou/gopsutil/v4/net/net_unix.go
@@ -29,11 +29,7 @@ func ConnectionsPidWithContext(ctx context.Context, kind string, pid int32) ([]C
switch strings.ToLower(kind) {
default:
fallthrough
- case "":
- fallthrough
- case "all":
- fallthrough
- case "inet":
+ case "", "all", "inet":
args = append(args, "tcp", "-i", "udp")
case "inet4":
args = append(args, "4")
@@ -135,7 +131,7 @@ func parseNetLine(line string) (ConnectionStat, error) {
return n, nil
}
-func parseNetAddr(line string) (laddr Addr, raddr Addr, err error) {
+func parseNetAddr(line string) (laddr, raddr Addr, err error) {
parse := func(l string) (Addr, error) {
host, port, err := net.SplitHostPort(l)
if err != nil {
diff --git a/vendor/github.com/shirou/gopsutil/v4/process/process_darwin.go b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin.go
index 5afafd8..91f3932 100644
--- a/vendor/github.com/shirou/gopsutil/v4/process/process_darwin.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_darwin.go
@@ -45,7 +45,8 @@ func pidsWithContext(_ context.Context) ([]int32, error) {
return ret, err
}
- for _, proc := range kprocs {
+ for i := range kprocs {
+ proc := &kprocs[i]
ret = append(ret, int32(proc.Proc.P_pid))
}
@@ -74,7 +75,7 @@ func (p *Process) NameWithContext(ctx context.Context) (string, error) {
if err != nil {
return "", err
}
- if len(cmdName) > 0 {
+ if cmdName != "" {
extendedName := filepath.Base(cmdName)
if strings.HasPrefix(extendedName, p.name) {
name = extendedName
@@ -238,7 +239,7 @@ func (p *Process) getKProc() (*unix.KinfoProc, error) {
// Return value deletes Header line(you must not input wrong arg).
// And splited by Space. Caller have responsibility to manage.
// If passed arg pid is 0, get information from all process.
-func callPsWithContext(ctx context.Context, arg string, pid int32, threadOption bool, nameOption bool) ([][]string, error) {
+func callPsWithContext(ctx context.Context, arg string, pid int32, threadOption, nameOption bool) ([][]string, error) {
var cmd []string
switch {
case pid == 0: // will get from all processes.
@@ -396,7 +397,7 @@ func (p *Process) cmdlineSlice() ([]string, error) {
// of the process.
for _, arg := range args[1:] {
argStr = string(arg)
- if len(argStr) > 0 {
+ if argStr != "" {
if nargs > 0 {
argSlice = append(argSlice, argStr)
nargs--
diff --git a/vendor/github.com/shirou/gopsutil/v4/process/process_linux.go b/vendor/github.com/shirou/gopsutil/v4/process/process_linux.go
index bf96fd3..f44f6bc 100644
--- a/vendor/github.com/shirou/gopsutil/v4/process/process_linux.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_linux.go
@@ -358,7 +358,7 @@ func (p *Process) ChildrenWithContext(ctx context.Context) ([]*Process, error) {
if err != nil {
continue
}
- if int32(ppid) == p.Pid {
+ if ppid == int64(p.Pid) {
np, err := NewProcessWithContext(ctx, int32(pid))
if err != nil {
continue
@@ -372,15 +372,7 @@ func (p *Process) ChildrenWithContext(ctx context.Context) ([]*Process, error) {
func (p *Process) OpenFilesWithContext(ctx context.Context) ([]OpenFilesStat, error) {
_, ofs, err := p.fillFromfdWithContext(ctx)
- if err != nil {
- return nil, err
- }
- ret := make([]OpenFilesStat, len(ofs))
- for i, o := range ofs {
- ret[i] = *o
- }
-
- return ret, nil
+ return ofs, err
}
func (p *Process) ConnectionsWithContext(ctx context.Context) ([]net.ConnectionStat, error) {
@@ -629,17 +621,17 @@ func (p *Process) fillFromfdListWithContext(ctx context.Context) (string, []stri
}
// Get num_fds from /proc/(pid)/fd
-func (p *Process) fillFromfdWithContext(ctx context.Context) (int32, []*OpenFilesStat, error) {
+func (p *Process) fillFromfdWithContext(ctx context.Context) (int32, []OpenFilesStat, error) {
statPath, fnames, err := p.fillFromfdListWithContext(ctx)
if err != nil {
return 0, nil, err
}
numFDs := int32(len(fnames))
- var openfiles []*OpenFilesStat
+ openfiles := make([]OpenFilesStat, 0, numFDs)
for _, fd := range fnames {
fpath := filepath.Join(statPath, fd)
- filepath, err := os.Readlink(fpath)
+ path, err := common.Readlink(fpath)
if err != nil {
continue
}
@@ -647,8 +639,8 @@ func (p *Process) fillFromfdWithContext(ctx context.Context) (int32, []*OpenFile
if err != nil {
return numFDs, openfiles, err
}
- o := &OpenFilesStat{
- Path: filepath,
+ o := OpenFilesStat{
+ Path: path,
Fd: t,
}
openfiles = append(openfiles, o)
diff --git a/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd.go b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd.go
index 5a6d361..063ff20 100644
--- a/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_openbsd.go
@@ -358,7 +358,7 @@ func (p *Process) getKProc() (*KinfoProc, error) {
return &k, nil
}
-func callKernProcSyscall(op int32, arg int32) ([]byte, uint64, error) {
+func callKernProcSyscall(op, arg int32) ([]byte, uint64, error) {
mib := []int32{CTLKern, KernProc, op, arg, sizeOfKinfoProc, 0}
mibptr := unsafe.Pointer(&mib[0])
miblen := uint64(len(mib))
diff --git a/vendor/github.com/shirou/gopsutil/v4/process/process_posix.go b/vendor/github.com/shirou/gopsutil/v4/process/process_posix.go
index 12d5fe2..9fe55b4 100644
--- a/vendor/github.com/shirou/gopsutil/v4/process/process_posix.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_posix.go
@@ -67,7 +67,8 @@ func getTerminalMap() (map[uint64]string, error) {
for _, name := range termfiles {
stat := unix.Stat_t{}
- if err = unix.Stat(name, &stat); err != nil {
+ err = unix.Stat(name, &stat)
+ if err != nil {
return nil, err
}
rdev := uint64(stat.Rdev)
diff --git a/vendor/github.com/shirou/gopsutil/v4/process/process_windows.go b/vendor/github.com/shirou/gopsutil/v4/process/process_windows.go
index 6142abc..b4748d3 100644
--- a/vendor/github.com/shirou/gopsutil/v4/process/process_windows.go
+++ b/vendor/github.com/shirou/gopsutil/v4/process/process_windows.go
@@ -882,7 +882,8 @@ func getFromSnapProcess(pid int32) (int32, int32, string, error) { //nolint:unpa
defer windows.CloseHandle(snap)
var pe32 windows.ProcessEntry32
pe32.Size = uint32(unsafe.Sizeof(pe32))
- if err = windows.Process32First(snap, &pe32); err != nil {
+ err = windows.Process32First(snap, &pe32)
+ if err != nil {
return 0, 0, "", err
}
for {