@@ -1,4 +1,5 @@

-/*Package filters provides tools for encoding a mapping of keys to a set of

+/*

+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"

@@ -45,31 +45,32 @@ func (ipnet *NetIPNet) UnmarshalJSON(b []byte) (err error) {

 // IndexInfo contains information about a registry

 //

 // RepositoryInfo Examples:

-// {

-//   "Index" : {

-//     "Name" : "docker.io",

-//     "Mirrors" : ["https://registry-2.docker.io/v1/", "https://registry-3.docker.io/v1/"],

-//     "Secure" : true,

-//     "Official" : true,

-//   },

-//   "RemoteName" : "library/debian",

-//   "LocalName" : "debian",

-//   "CanonicalName" : "docker.io/debian"

-//   "Official" : true,

-// }

 //

-// {

-//   "Index" : {

-//     "Name" : "127.0.0.1:5000",

-//     "Mirrors" : [],

-//     "Secure" : false,

-//     "Official" : false,

-//   },

-//   "RemoteName" : "user/repo",

-//   "LocalName" : "127.0.0.1:5000/user/repo",

-//   "CanonicalName" : "127.0.0.1:5000/user/repo",

-//   "Official" : false,

-// }

+//	{

+//	  "Index" : {

+//	    "Name" : "docker.io",

+//	    "Mirrors" : ["https://registry-2.docker.io/v1/", "https://registry-3.docker.io/v1/"],

+//	    "Secure" : true,

+//	    "Official" : true,

+//	  },

+//	  "RemoteName" : "library/debian",

+//	  "LocalName" : "debian",

+//	  "CanonicalName" : "docker.io/debian"

+//	  "Official" : true,

+//	}

+//

+//	{

+//	  "Index" : {

+//	    "Name" : "127.0.0.1:5000",

+//	    "Mirrors" : [],

+//	    "Secure" : false,

+//	    "Official" : false,

+//	  },

+//	  "RemoteName" : "user/repo",

+//	  "LocalName" : "127.0.0.1:5000/user/repo",

+//	  "CanonicalName" : "127.0.0.1:5000/user/repo",

+//	  "Official" : false,

+//	}

 type IndexInfo struct {

 	// Name is the name of the registry, such as "docker.io"

 	Name string

@@ -100,8 +100,10 @@ func GetTimestamp(value string, reference time.Time) (string, error) {

 // if the incoming nanosecond portion is longer or shorter than 9 digits it is

 // converted to nanoseconds.  The expectation is that the seconds and

 // seconds will be used to create a time variable.  For example:

-//     seconds, nanoseconds, err := ParseTimestamp("1136073600.000000001",0)

-//     if err == nil since := time.Unix(seconds, nanoseconds)

+//

+//	seconds, nanoseconds, err := ParseTimestamp("1136073600.000000001",0)

+//	if err == nil since := time.Unix(seconds, nanoseconds)

+//

 // returns seconds as def(aultSeconds) if value == ""

 func ParseTimestamps(value string, def int64) (int64, int64, error) {

 	if value == "" {

@@ -35,7 +35,6 @@ import (

 //

 // Sets the environment variable foo to bar, also makes interpolation

 // in the dockerfile available from the next statement on via ${foo}.

-//

 func dispatchEnv(d dispatchRequest, c *instructions.EnvCommand) error {

 	runConfig := d.state.runConfig

 	commitMessage := bytes.NewBufferString("ENV")

@@ -73,7 +72,6 @@ func dispatchMaintainer(d dispatchRequest, c *instructions.MaintainerCommand) er

 // LABEL some json data describing the image

 //

 // Sets the Label variable foo to bar,

-//

 func dispatchLabel(d dispatchRequest, c *instructions.LabelCommand) error {

 	if d.state.runConfig.Labels == nil {

 		d.state.runConfig.Labels = make(map[string]string)

@@ -90,7 +88,6 @@ func dispatchLabel(d dispatchRequest, c *instructions.LabelCommand) error {

 //

 // Add the file 'foo' to '/path'. Tarball and Remote URL (http, https) handling

 // exist here. If you do not wish to have this automatic handling, use COPY.

-//

 func dispatchAdd(d dispatchRequest, c *instructions.AddCommand) error {

 	if c.Chmod != "" {

 		return errors.New("the --chmod option requires BuildKit. Refer to https://docs.docker.com/go/buildkit/ to learn how to build images with BuildKit enabled")

@@ -112,7 +109,6 @@ func dispatchAdd(d dispatchRequest, c *instructions.AddCommand) error {

 // COPY foo /path

 //

 // Same as 'ADD' but without the tar and remote url handling.

-//

 func dispatchCopy(d dispatchRequest, c *instructions.CopyCommand) error {

 	if c.Chmod != "" {

 		return errors.New("the --chmod option requires BuildKit. Refer to https://docs.docker.com/go/buildkit/ to learn how to build images with BuildKit enabled")

@@ -157,7 +153,6 @@ func (d *dispatchRequest) getImageMount(imageRefOrID string) (*imageMount, error

 }

 // FROM [--platform=platform] imagename[:tag | @digest] [AS build-stage-name]

-//

 func initializeStage(d dispatchRequest, cmd *instructions.Stage) error {

 	d.builder.imageProber.Reset()

@@ -290,7 +285,6 @@ func dispatchOnbuild(d dispatchRequest, c *instructions.OnbuildCommand) error {

 // WORKDIR /tmp

 //

 // Set the working directory for future RUN/CMD/etc statements.

-//

 func dispatchWorkdir(d dispatchRequest, c *instructions.WorkdirCommand) error {

 	runConfig := d.state.runConfig

 	var err error

@@ -333,7 +327,6 @@ func dispatchWorkdir(d dispatchRequest, c *instructions.WorkdirCommand) error {

 // RUN echo hi          # sh -c echo hi       (Linux and LCOW)

 // RUN echo hi          # cmd /S /C echo hi   (Windows)

 // RUN [ "echo", "hi" ] # echo hi

-//

 func dispatchRun(d dispatchRequest, c *instructions.RunCommand) error {

 	if !system.IsOSSupported(d.state.operatingSystem) {

 		return system.ErrNotSupportedOperatingSystem

@@ -428,7 +421,6 @@ func prependEnvOnCmd(buildArgs *BuildArgs, buildArgVars []string, cmd strslice.S

 //

 // Set the default command to run in the container (which may be empty).

 // Argument handling is the same as RUN.

-//

 func dispatchCmd(d dispatchRequest, c *instructions.CmdCommand) error {

 	runConfig := d.state.runConfig

 	cmd, argsEscaped := resolveCmdLine(c.ShellDependantCmdLine, runConfig, d.state.operatingSystem, c.Name(), c.String())

@@ -459,7 +451,6 @@ func dispatchCmd(d dispatchRequest, c *instructions.CmdCommand) error {

 //

 // Set the default healthcheck command to run in the container (which may be empty).

 // Argument handling is the same as RUN.

-//

 func dispatchHealthcheck(d dispatchRequest, c *instructions.HealthCheckCommand) error {

 	runConfig := d.state.runConfig

 	if runConfig.Healthcheck != nil {

@@ -479,7 +470,6 @@ func dispatchHealthcheck(d dispatchRequest, c *instructions.HealthCheckCommand)

 //

 // Handles command processing similar to CMD and RUN, only req.runConfig.Entrypoint

 // is initialized at newBuilder time instead of through argument parsing.

-//

 func dispatchEntrypoint(d dispatchRequest, c *instructions.EntrypointCommand) error {

 	runConfig := d.state.runConfig

 	cmd, argsEscaped := resolveCmdLine(c.ShellDependantCmdLine, runConfig, d.state.operatingSystem, c.Name(), c.String())

@@ -509,7 +499,6 @@ func dispatchEntrypoint(d dispatchRequest, c *instructions.EntrypointCommand) er

 //

 // Expose ports for links and port mappings. This all ends up in

 // req.runConfig.ExposedPorts for runconfig.

-//

 func dispatchExpose(d dispatchRequest, c *instructions.ExposeCommand, envs []string) error {

 	// custom multi word expansion

 	// expose $FOO with FOO="80 443" is expanded as EXPOSE [80,443]. This is the only command supporting word to words expansion

@@ -543,7 +532,6 @@ func dispatchExpose(d dispatchRequest, c *instructions.ExposeCommand, envs []str

 //

 // Set the user to 'foo' for future commands and when running the

 // ENTRYPOINT/CMD at container run time.

-//

 func dispatchUser(d dispatchRequest, c *instructions.UserCommand) error {

 	d.state.runConfig.User = c.User

 	return d.builder.commit(d.state, fmt.Sprintf("USER %v", c.User))

@@ -552,7 +540,6 @@ func dispatchUser(d dispatchRequest, c *instructions.UserCommand) error {

 // VOLUME /foo

 //

 // Expose the volume /foo for use. Will also accept the JSON array form.

-//

 func dispatchVolume(d dispatchRequest, c *instructions.VolumeCommand) error {

 	if d.state.runConfig.Volumes == nil {

 		d.state.runConfig.Volumes = map[string]struct{}{}

@@ -80,10 +80,10 @@ func GetWithStatusError(address string) (resp *http.Response, err error) {

 // inspectResponse looks into the http response data at r to determine whether its

 // content-type is on the list of acceptable content types for remote build contexts.

 // This function returns:

-//    - a string representation of the detected content-type

-//    - an io.Reader for the response body

-//    - an error value which will be non-nil either when something goes wrong while

-//      reading bytes from r or when the detected content-type is not acceptable.

+//   - a string representation of the detected content-type

+//   - an io.Reader for the response body

+//   - an error value which will be non-nil either when something goes wrong while

+//     reading bytes from r or when the detected content-type is not acceptable.

 func inspectResponse(ct string, r io.Reader, clen int64) (string, io.Reader, error) {

 	plen := clen

 	if plen <= 0 || plen > maxPreambleLength {

@@ -30,12 +30,11 @@ func IsURL(str string) bool {

 //

 // The following patterns are considered to be a Git URL:

 //

-// - https://(.*).git(?:#.+)?$  git repository URL with optional fragment, as

-//                              known to be used by GitHub and GitLab.

-// - http://(.*).git(?:#.+)?$   same, but non-TLS

-// - git://(.*)                 URLs using git:// scheme

-// - git@(.*)

-// - github.com/                see description below

+//   - https://(.*).git(?:#.+)?$  git repository URL with optional fragment, as known to be used by GitHub and GitLab.

+//   - http://(.*).git(?:#.+)?$   same, but non-TLS

+//   - git://(.*)                 URLs using git:// scheme

+//   - git@(.*)

+//   - github.com/                see description below

 //

 // The github.com/ prefix is a special case used to treat context-paths

 // starting with "github.com/" as a git URL if the given path does not

@@ -49,7 +48,7 @@ func IsURL(str string) bool {

 // path. Code using this function should check if the path exists locally before

 // using it as a URL.

 //

-// Fragments

+// # Fragments

 //

 // Git URLs accept context configuration in their fragment section, separated by

 // a colon (`:`). The first part represents the reference to check out, and can

@@ -74,7 +73,6 @@ func IsURL(str string) bool {

 // | my-repo.git#master:directory   | refs/heads/master    | /directory         |

 // | my-repo.git#mytag:directory    | refs/tags/my-tag     | /directory         |

 // | my-repo.git#mybranch:directory | refs/heads/my-branch | /directory         |

-//

 func IsGitURL(str string) bool {

 	if IsURL(str) && urlPathWithFragmentSuffix.MatchString(str) {

 		return true

@@ -4,7 +4,7 @@ Package client is a Go client for the Docker Engine API.

 For more information about the Engine API, see the documentation:

 https://docs.docker.com/engine/api/

-Usage

+# Usage

 You use the library by creating a client object and calling methods on it. The

 client can be created either from environment variables with NewClientWithOpts(client.FromEnv),

@@ -37,7 +37,6 @@ For example, to list running containers (the equivalent of "docker ps"):

 			fmt.Printf("%s %s\n", container.ID[:10], container.Image)

 		}

 	}

-

 */

 package client // import "github.com/docker/docker/client"

@@ -121,12 +120,10 @@ func CheckRedirect(req *http.Request, via []*http.Request) error {

 // itself with values from environment variables (client.FromEnv), and has

 // automatic API version negotiation enabled (client.WithAPIVersionNegotiation()).

 //

-//

 //	cli, err := client.NewClientWithOpts(

 //		client.FromEnv,

 //		client.WithAPIVersionNegotiation(),

 //	)

-//

 func NewClientWithOpts(ops ...Opt) (*Client, error) {

 	client, err := defaultHTTPClient(DefaultDockerHost)

 	if err != nil {

@@ -22,7 +22,7 @@ import (

 // multiplexed.

 // The format of the multiplexed stream is as follows:

 //

-//    [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT}

+//	[8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT}

 //

 // STREAM_TYPE can be 1 for stdout and 2 for stderr

 //

@@ -24,7 +24,7 @@ import (

 // multiplexed.

 // The format of the multiplexed stream is as follows:

 //

-//    [8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT}

+//	[8]byte{STREAM_TYPE, 0, 0, 0, SIZE1, SIZE2, SIZE3, SIZE4}[]byte{OUTPUT}

 //

 // STREAM_TYPE can be 1 for stdout and 2 for stderr

 //

@@ -648,7 +648,7 @@ func newAPIServerConfig(config *config.Config) (*apiserver.Config, error) {

 // checkTLSAuthOK checks basically for an explicitly disabled TLS/TLSVerify

 // Going forward we do not want to support a scenario where dockerd listens

-//   on TCP without either TLS client auth (or an explicit opt-in to disable it)

+// on TCP without either TLS client auth (or an explicit opt-in to disable it)

 func checkTLSAuthOK(c *config.Config) bool {

 	if c.TLS == nil {

 		// Either TLS is enabled by default, in which case TLS verification should be enabled by default, or explicitly disabled

@@ -14,14 +14,13 @@ import (

 // behavior expected from a vanilla unix command-line tool in general

 // (and the Docker engine in particular).

 //

-// * If SIGINT or SIGTERM are received, `cleanup` is called, then the process is terminated.

-// * If SIGINT or SIGTERM are received 3 times before cleanup is complete, then cleanup is

-//   skipped and the process is terminated immediately (allows force quit of stuck daemon)

-// * A SIGQUIT always causes an exit without cleanup, with a goroutine dump preceding exit.

-// * Ignore SIGPIPE events. These are generated by systemd when journald is restarted while

-//   the docker daemon is not restarted and also running under systemd.

-//   Fixes https://github.com/docker/docker/issues/19728

-//

+//   - If SIGINT or SIGTERM are received, `cleanup` is called, then the process is terminated.

+//   - If SIGINT or SIGTERM are received 3 times before cleanup is complete, then cleanup is

+//     skipped and the process is terminated immediately (allows force quit of stuck daemon)

+//   - A SIGQUIT always causes an exit without cleanup, with a goroutine dump preceding exit.

+//   - Ignore SIGPIPE events. These are generated by systemd when journald is restarted while

+//     the docker daemon is not restarted and also running under systemd.

+//     Fixes https://github.com/docker/docker/issues/19728

 func Trap(cleanup func(), logger interface {

 	Info(args ...interface{})

 }) {

@@ -295,10 +295,11 @@ func (container *Container) SetupWorkingDirectory(rootIdentity idtools.Identity)

 // particular path inside the container as though you were a process in that

 // container.

 //

-// NOTE: The returned path is *only* safely scoped inside the container's BaseFS

-//       if no component of the returned path changes (such as a component

-//       symlinking to a different path) between using this method and using the

-//       path. See symlink.FollowSymlinkInScope for more details.

+// # NOTE

+// The returned path is *only* safely scoped inside the container's BaseFS

+// if no component of the returned path changes (such as a component

+// symlinking to a different path) between using this method and using the

+// path. See symlink.FollowSymlinkInScope for more details.

 func (container *Container) GetResourcePath(path string) (string, error) {

 	if container.BaseFS == nil {

 		return "", errors.New("GetResourcePath: BaseFS of container " + container.ID + " is unexpectedly nil")

@@ -324,10 +325,11 @@ func (container *Container) GetResourcePath(path string) (string, error) {

 // Only use this method to safely access the container's `container.json` or

 // other metadata files. If in doubt, use container.GetResourcePath.

 //

-// NOTE: The returned path is *only* safely scoped inside the container's root

-//       if no component of the returned path changes (such as a component

-//       symlinking to a different path) between using this method and using the

-//       path. See symlink.FollowSymlinkInScope for more details.

+// # NOTE

+// The returned path is *only* safely scoped inside the container's root

+// if no component of the returned path changes (such as a component

+// symlinking to a different path) between using this method and using the

+// path. See symlink.FollowSymlinkInScope for more details.

 func (container *Container) GetRootResourcePath(path string) (string, error) {

 	// IMPORTANT - These are paths on the OS where the daemon is running, hence

 	// any filepath operations must be done in an OS agnostic way.

@@ -205,9 +205,9 @@ func resolveInterfaceAddr(specifiedInterface string) (net.IP, error) {

 }

 // resolveInputIPAddr tries to resolve the IP address from the string passed as input

-// - tries to match the string as an interface name, if so returns the IP address associated with it

-// - on failure of previous step tries to parse the string as an IP address itself

-//	 if succeeds returns the IP address

+//   - tries to match the string as an interface name, if so returns the IP address associated with it

+//   - on failure of previous step tries to parse the string as an IP address itself

+//     if succeeds returns the IP address

 func resolveInputIPAddr(input string, isUnspecifiedValid bool) (net.IP, error) {

 	// Try to see if it is an interface name

 	interfaceAddr, err := resolveInterfaceAddr(input)

@@ -27,11 +27,11 @@ import (

 // GetContainer looks for a container using the provided information, which could be

 // one of the following inputs from the caller:

-//  - A full container ID, which will exact match a container in daemon's list

-//  - A container name, which will only exact match via the GetByName() function

-//  - A partial container ID prefix (e.g. short ID) of any length that is

-//    unique enough to only return a single container object

-//  If none of these searches succeed, an error is returned

+//   - A full container ID, which will exact match a container in daemon's list

+//   - A container name, which will only exact match via the GetByName() function

+//   - A partial container ID prefix (e.g. short ID) of any length that is

+//     unique enough to only return a single container object

+//     If none of these searches succeed, an error is returned

 func (daemon *Daemon) GetContainer(prefixOrName string) (*container.Container, error) {

 	if len(prefixOrName) == 0 {

 		return nil, errors.WithStack(invalidIdentifier(prefixOrName))

@@ -1077,15 +1077,16 @@ func setupInitLayer(idMapping idtools.IdentityMapping) func(containerfs.Containe

 }

 // Parse the remapped root (user namespace) option, which can be one of:

-//   username            - valid username from /etc/passwd

-//   username:groupname  - valid username; valid groupname from /etc/group

-//   uid                 - 32-bit unsigned int valid Linux UID value

-//   uid:gid             - uid value; 32-bit unsigned int Linux GID value

 //

-//  If no groupname is specified, and a username is specified, an attempt

-//  will be made to lookup a gid for that username as a groupname

+// - username            - valid username from /etc/passwd

+// - username:groupname  - valid username; valid groupname from /etc/group

+// - uid                 - 32-bit unsigned int valid Linux UID value

+// - uid:gid             - uid value; 32-bit unsigned int Linux GID value

 //

-//  If names are used, they are verified to exist in passwd/group

+// If no groupname is specified, and a username is specified, an attempt

+// will be made to lookup a gid for that username as a groupname

+//

+// If names are used, they are verified to exist in passwd/group

 func parseRemappedRoot(usergrp string) (string, string, error) {

 	var (

@@ -30,10 +30,11 @@ type NaiveDiffDriver struct {

 // NewNaiveDiffDriver returns a fully functional driver that wraps the

 // given ProtoDriver and adds the capability of the following methods which

 // it may or may not support on its own:

-//     Diff(id, parent string) (archive.Archive, error)

-//     Changes(id, parent string) ([]archive.Change, error)

-//     ApplyDiff(id, parent string, diff archive.Reader) (size int64, err error)

-//     DiffSize(id, parent string) (size int64, err error)

+//

+//	Diff(id, parent string) (archive.Archive, error)

+//	Changes(id, parent string) ([]archive.Change, error)

+//	ApplyDiff(id, parent string, diff archive.Reader) (size int64, err error)

+//	DiffSize(id, parent string) (size int64, err error)

 func NewNaiveDiffDriver(driver ProtoDriver, idMap idtools.IdentityMapping) Driver {

 	return &NaiveDiffDriver{ProtoDriver: driver,

 		idMap: idMap}

@@ -219,7 +219,7 @@ func (i *ImageService) GetImage(refOrID string, platform *specs.Platform) (retIm

 }

 // OnlyPlatformWithFallback uses `platforms.Only` with a fallback to handle the case where the platform

-//  being matched does not have a CPU variant.

+// being matched does not have a CPU variant.

 //

 // The reason for this is that CPU variant is not even if the official image config spec as of this writing.

 // See: https://github.com/opencontainers/image-spec/pull/809

@@ -104,9 +104,9 @@ func exportContainerRw(layerStore layer.Store, id, mountLabel string) (arch io.R

 // the build.

 //

 // This method is different from CreateImageFromContainer:

-//   * it doesn't attempt to validate container state

-//   * it doesn't send a commit action to metrics

-//   * it doesn't log a container commit event

+//   - it doesn't attempt to validate container state

+//   - it doesn't send a commit action to metrics

+//   - it doesn't log a container commit event

 //

 // This is a temporary shim. Should be removed when builder stops using commit.

 func (i *ImageService) CommitBuildStep(c backend.CommitConfig) (image.ID, error) {

@@ -44,13 +44,13 @@ const (

 // are divided into two categories grouped by their severity:

 //

 // Hard Conflict:

-// 	- a pull or build using the image.

-// 	- any descendant image.

-// 	- any running container using the image.

+//   - a pull or build using the image.

+//   - any descendant image.

+//   - any running container using the image.

 //

 // Soft Conflict:

-// 	- any stopped container using the image.

-// 	- any repository tag or digest references to the image.

+//   - any stopped container using the image.

+//   - any repository tag or digest references to the image.

 //

 // The image cannot be removed if there are any hard conflicts and can be

 // removed if there are soft conflicts only if force is true.

@@ -58,7 +58,6 @@ const (

 // If prune is true, ancestor images will each attempt to be deleted quietly,

 // meaning any delete conflicts will cause the image to not be deleted and the

 // conflict will not be reported.

-//

 func (i *ImageService) ImageDelete(imageRef string, force, prune bool) ([]types.ImageDeleteResponseItem, error) {

 	start := time.Now()

 	records := []types.ImageDeleteResponseItem{}

@@ -306,7 +306,7 @@ func getBackingFs(v *types.Info) string {

 //

 // Output example from `docker-init --version`:

 //

-//     tini version 0.18.0 - git.fec3683

+//	tini version 0.18.0 - git.fec3683

 func parseInitVersion(v string) (version string, commit string, err error) {

 	parts := strings.Split(v, " - ")

@@ -331,9 +331,9 @@ func parseInitVersion(v string) (version string, commit string, err error) {

 //

 // Output example from `runc --version`:

 //

-//   runc version 1.0.0-rc5+dev

-//   commit: 69663f0bd4b60df09991c08812a60108003fa340

-//   spec: 1.0.0

+//	runc version 1.0.0-rc5+dev

+//	commit: 69663f0bd4b60df09991c08812a60108003fa340

+//	spec: 1.0.0

 func parseRuntimeVersion(v string) (runtime string, version string, commit string, err error) {

 	lines := strings.Split(strings.TrimSpace(v), "\n")

 	for _, line := range lines {

@@ -11,19 +11,20 @@ import (

 )

 // ContainerTop handles `docker top` client requests.

+//

 // Future considerations:

-// -- Windows users are far more familiar with CPU% total.

-//    Further, users on Windows rarely see user/kernel CPU stats split.

-//    The kernel returns everything in terms of 100ns. To obtain

-//    CPU%, we could do something like docker stats does which takes two

-//    samples, subtract the difference and do the maths. Unfortunately this

-//    would slow the stat call down and require two kernel calls. So instead,

-//    we do something similar to linux and display the CPU as combined HH:MM:SS.mmm.

-// -- Perhaps we could add an argument to display "raw" stats

-// -- "Memory" is an extremely overloaded term in Windows. Hence we do what

-//    task manager does and use the private working set as the memory counter.

-//    We could return more info for those who really understand how memory

-//    management works in Windows if we introduced a "raw" stats (above).

+//   - Windows users are far more familiar with CPU% total.

+//     Further, users on Windows rarely see user/kernel CPU stats split.

+//     The kernel returns everything in terms of 100ns. To obtain

+//     CPU%, we could do something like docker stats does which takes two

+//     samples, subtract the difference and do the maths. Unfortunately this

+//     would slow the stat call down and require two kernel calls. So instead,

+//     we do something similar to linux and display the CPU as combined HH:MM:SS.mmm.

+//   - Perhaps we could add an argument to display "raw" stats

+//   - "Memory" is an extremely overloaded term in Windows. Hence we do what

+//     task manager does and use the private working set as the memory counter.

+//     We could return more info for those who really understand how memory

+//     management works in Windows if we introduced a "raw" stats (above).

 func (daemon *Daemon) ContainerTop(name string, psArgs string) (*containertypes.ContainerTopOKBody, error) {

 	// It's not at all an equivalent to linux 'ps' on Windows

 	if psArgs != "" {

@@ -14,7 +14,8 @@ type UAStringKey struct{}

 // DockerUserAgent is the User-Agent the Docker client uses to identify itself.

 // In accordance with RFC 7231 (5.5.3) is of the form:

-//    [docker client's UA] UpstreamClient([upstream client's UA])

+//

+//	[docker client's UA] UpstreamClient([upstream client's UA])

 func DockerUserAgent(ctx context.Context) string {

 	httpVersion := make([]useragent.VersionInfo, 0, 6)

 	httpVersion = append(httpVersion, useragent.VersionInfo{Name: "docker", Version: Version})

@@ -68,7 +69,8 @@ func escapeStr(s string, charsToEscape string) string {

 // insertUpstreamUserAgent adds the upstream client useragent to create a user-agent

 // string of the form:

-//   $dockerUA UpstreamClient($upstreamUA)

+//

+//	$dockerUA UpstreamClient($upstreamUA)

 func insertUpstreamUserAgent(upstreamUA string, dockerUA string) string {

 	charsToEscape := `();\`

 	upstreamUAEscaped := escapeStr(upstreamUA, charsToEscape)

@@ -93,9 +93,10 @@ func (s *DockerCLICpSuite) TestCpFromSymlinkDestination(c *testing.T) {

 //   J   |  yes     |  yes            |  yes      |  yes     |  -       |  copy dir contents

 //

-// A. SRC specifies a file and DST (no trailing path separator) doesn't

-//    exist. This should create a file with the name DST and copy the

-//    contents of the source file into it.

+// A. SRC specifies a file and DST (no trailing path separator) doesn't	exist.

+//

+// This should create a file with the name DST and copy the contents of the

+// source file into it.

 func (s *DockerCLICpSuite) TestCpFromCaseA(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{

@@ -112,9 +113,10 @@ func (s *DockerCLICpSuite) TestCpFromCaseA(c *testing.T) {

 	assert.NilError(c, fileContentEquals(c, dstPath, "file1\n"))

 }

-// B. SRC specifies a file and DST (with trailing path separator) doesn't

-//    exist. This should cause an error because the copy operation cannot

-//    create a directory when copying a single file.

+// B. SRC specifies a file and DST (with trailing path separator) doesn't exist.

+//

+// This should cause an error because the copy operation cannot	create a directory

+// when copying a single file.

 func (s *DockerCLICpSuite) TestCpFromCaseB(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{addContent: true})

@@ -130,8 +132,9 @@ func (s *DockerCLICpSuite) TestCpFromCaseB(c *testing.T) {

 	assert.Assert(c, isCpDirNotExist(err), "expected DirNotExists error, but got %T: %s", err, err)

 }

-// C. SRC specifies a file and DST exists as a file. This should overwrite

-//    the file at DST with the contents of the source file.

+// C. SRC specifies a file and DST exists as a file.

+//

+// This should overwrite the file at DST with the contents of the source file.

 func (s *DockerCLICpSuite) TestCpFromCaseC(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{

@@ -152,9 +155,10 @@ func (s *DockerCLICpSuite) TestCpFromCaseC(c *testing.T) {

 	assert.NilError(c, fileContentEquals(c, dstPath, "file1\n"))

 }

-// D. SRC specifies a file and DST exists as a directory. This should place

-//    a copy of the source file inside it using the basename from SRC. Ensure

-//    this works whether DST has a trailing path separator or not.

+// D. SRC specifies a file and DST exists as a directory.

+//

+// This should place a copy of the source file inside it using the basename from

+// SRC. Ensure this works whether DST has a trailing path separator or not.

 func (s *DockerCLICpSuite) TestCpFromCaseD(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{addContent: true})

@@ -186,10 +190,11 @@ func (s *DockerCLICpSuite) TestCpFromCaseD(c *testing.T) {

 	assert.NilError(c, fileContentEquals(c, dstPath, "file1\n"))

 }

-// E. SRC specifies a directory and DST does not exist. This should create a

-//    directory at DST and copy the contents of the SRC directory into the DST

-//    directory. Ensure this works whether DST has a trailing path separator or

-//    not.

+// E. SRC specifies a directory and DST does not exist.

+//

+// This should create a directory at DST and copy the contents of the SRC directory

+// into the DST directory. Ensure this works whether DST has a trailing path

+// separator or	not.

 func (s *DockerCLICpSuite) TestCpFromCaseE(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{addContent: true})

@@ -214,8 +219,10 @@ func (s *DockerCLICpSuite) TestCpFromCaseE(c *testing.T) {

 	assert.NilError(c, fileContentEquals(c, dstPath, "file1-1\n"))

 }

-// F. SRC specifies a directory and DST exists as a file. This should cause an

-//    error as it is not possible to overwrite a file with a directory.

+// F. SRC specifies a directory and DST exists as a file.

+//

+// This should cause an	error as it is not possible to overwrite a file with a

+// directory.

 func (s *DockerCLICpSuite) TestCpFromCaseF(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{

@@ -235,9 +242,10 @@ func (s *DockerCLICpSuite) TestCpFromCaseF(c *testing.T) {

 	assert.Assert(c, isCpCannotCopyDir(err), "expected ErrCannotCopyDir error, but got %T: %s", err, err)

 }

-// G. SRC specifies a directory and DST exists as a directory. This should copy

-//    the SRC directory and all its contents to the DST directory. Ensure this

-//    works whether DST has a trailing path separator or not.

+// G. SRC specifies a directory and DST exists as a directory.

+//

+// This should copy	the SRC directory and all its contents to the DST directory.

+// Ensure this works whether DST has a trailing path separator or not.

 func (s *DockerCLICpSuite) TestCpFromCaseG(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{

@@ -268,10 +276,11 @@ func (s *DockerCLICpSuite) TestCpFromCaseG(c *testing.T) {

 	assert.NilError(c, fileContentEquals(c, dstPath, "file1-1\n"))

 }

-// H. SRC specifies a directory's contents only and DST does not exist. This

-//    should create a directory at DST and copy the contents of the SRC

-//    directory (but not the directory itself) into the DST directory. Ensure

-//    this works whether DST has a trailing path separator or not.

+// H. SRC specifies a directory's contents only and DST does not exist.

+//

+// This should create a directory at DST and copy the contents of the SRC

+// directory (but not the directory itself) into the DST directory. Ensure

+// this works whether DST has a trailing path separator or not.

 func (s *DockerCLICpSuite) TestCpFromCaseH(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{addContent: true})

@@ -296,9 +305,10 @@ func (s *DockerCLICpSuite) TestCpFromCaseH(c *testing.T) {

 	assert.NilError(c, fileContentEquals(c, dstPath, "file1-1\n"))

 }

-// I. SRC specifies a directory's contents only and DST exists as a file. This

-//    should cause an error as it is not possible to overwrite a file with a

-//    directory.

+// I. SRC specifies a directory's contents only and DST exists as a file.

+//

+// This	should cause an error as it is not possible to overwrite a file with a

+// directory.

 func (s *DockerCLICpSuite) TestCpFromCaseI(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{

@@ -319,9 +329,10 @@ func (s *DockerCLICpSuite) TestCpFromCaseI(c *testing.T) {

 }

 // J. SRC specifies a directory's contents only and DST exists as a directory.

-//    This should copy the contents of the SRC directory (but not the directory

-//    itself) into the DST directory. Ensure this works whether DST has a

-//    trailing path separator or not.

+//

+// This should copy the contents of the SRC directory (but not the directory

+// itself) into the DST directory. Ensure this works whether DST has a

+// trailing path separator or not.

 func (s *DockerCLICpSuite) TestCpFromCaseJ(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{

@@ -97,9 +97,10 @@ func (s *DockerCLICpSuite) TestCpToSymlinkDestination(c *testing.T) {

 //   J   |  yes     |  yes            |  yes      |  yes     |  -       |  copy dir contents

 //

-// A. SRC specifies a file and DST (no trailing path separator) doesn't

-//    exist. This should create a file with the name DST and copy the

-//    contents of the source file into it.

+// A. SRC specifies a file and DST (no trailing path separator) doesn't	exist.

+//

+// This should create a file with the name DST and copy the	contents of the

+// source file into it.

 func (s *DockerCLICpSuite) TestCpToCaseA(c *testing.T) {

 	containerID := makeTestContainer(c, testContainerOptions{

 		workDir: "/root", command: makeCatFileCommand("itWorks.txt"),

@@ -117,9 +118,10 @@ func (s *DockerCLICpSuite) TestCpToCaseA(c *testing.T) {

 	assert.NilError(c, containerStartOutputEquals(c, containerID, "file1\n"))

 }

-// B. SRC specifies a file and DST (with trailing path separator) doesn't

-//    exist. This should cause an error because the copy operation cannot

-//    create a directory when copying a single file.

+// B. SRC specifies a file and DST (with trailing path separator) doesn't exist.

+//

+// This should cause an error because the copy operation cannot	create a

+// directory when copying a single file.

 func (s *DockerCLICpSuite) TestCpToCaseB(c *testing.T) {

 	containerID := makeTestContainer(c, testContainerOptions{

 		command: makeCatFileCommand("testDir/file1"),

@@ -138,8 +140,9 @@ func (s *DockerCLICpSuite) TestCpToCaseB(c *testing.T) {

 	assert.Assert(c, isCpDirNotExist(err), "expected DirNotExists error, but got %T: %s", err, err)

 }

-// C. SRC specifies a file and DST exists as a file. This should overwrite

-//    the file at DST with the contents of the source file.

+// C. SRC specifies a file and DST exists as a file.

+//

+// This should overwrite the file at DST with the contents of the source file.

 func (s *DockerCLICpSuite) TestCpToCaseC(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{

@@ -161,9 +164,10 @@ func (s *DockerCLICpSuite) TestCpToCaseC(c *testing.T) {

 	assert.NilError(c, containerStartOutputEquals(c, containerID, "file1\n"), "Should now contain file1's contents")

 }

-// D. SRC specifies a file and DST exists as a directory. This should place

-//    a copy of the source file inside it using the basename from SRC. Ensure

-//    this works whether DST has a trailing path separator or not.

+// D. SRC specifies a file and DST exists as a directory.

+//

+// This should place a copy of the source file inside it using the basename from

+// SRC. Ensure this works whether DST has a trailing path separator or not.

 func (s *DockerCLICpSuite) TestCpToCaseD(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{

@@ -198,10 +202,11 @@ func (s *DockerCLICpSuite) TestCpToCaseD(c *testing.T) {

 	assert.NilError(c, containerStartOutputEquals(c, containerID, "file1\n"), "Should now contain file1's contents")

 }

-// E. SRC specifies a directory and DST does not exist. This should create a

-//    directory at DST and copy the contents of the SRC directory into the DST

-//    directory. Ensure this works whether DST has a trailing path separator or

-//    not.

+// E. SRC specifies a directory and DST does not exist.

+//

+// This should create a	directory at DST and copy the contents of the SRC

+// directory into the DST directory. Ensure this works whether DST has a

+// trailing path separator or not.

 func (s *DockerCLICpSuite) TestCpToCaseE(c *testing.T) {

 	containerID := makeTestContainer(c, testContainerOptions{

 		command: makeCatFileCommand("/testDir/file1-1"),

@@ -231,8 +236,10 @@ func (s *DockerCLICpSuite) TestCpToCaseE(c *testing.T) {

 	assert.NilError(c, containerStartOutputEquals(c, containerID, "file1-1\n"), "Should now contain file1-1's contents")

 }

-// F. SRC specifies a directory and DST exists as a file. This should cause an

-//    error as it is not possible to overwrite a file with a directory.

+// F. SRC specifies a directory and DST exists as a file.

+//

+// This should cause an error as it is not possible to overwrite a file with a

+// directory.

 func (s *DockerCLICpSuite) TestCpToCaseF(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{

@@ -252,9 +259,10 @@ func (s *DockerCLICpSuite) TestCpToCaseF(c *testing.T) {

 	assert.Assert(c, isCpCannotCopyDir(err), "expected ErrCannotCopyDir error, but got %T: %s", err, err)

 }

-// G. SRC specifies a directory and DST exists as a directory. This should copy

-//    the SRC directory and all its contents to the DST directory. Ensure this

-//    works whether DST has a trailing path separator or not.

+// G. SRC specifies a directory and DST exists as a directory.

+//

+// This should copy the SRC directory and all its contents to the DST directory.

+// Ensure this works whether DST has a trailing path separator or not.

 func (s *DockerCLICpSuite) TestCpToCaseG(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{

@@ -289,10 +297,11 @@ func (s *DockerCLICpSuite) TestCpToCaseG(c *testing.T) {

 	assert.NilError(c, containerStartOutputEquals(c, containerID, "file1-1\n"), "Should now contain file1-1's contents")

 }

-// H. SRC specifies a directory's contents only and DST does not exist. This

-//    should create a directory at DST and copy the contents of the SRC

-//    directory (but not the directory itself) into the DST directory. Ensure

-//    this works whether DST has a trailing path separator or not.

+// H. SRC specifies a directory's contents only and DST does not exist.

+//

+// This should create a directory at DST and copy the contents of the SRC

+// directory (but not the directory itself) into the DST directory. Ensure

+// this works whether DST has a trailing path separator or not.

 func (s *DockerCLICpSuite) TestCpToCaseH(c *testing.T) {

 	containerID := makeTestContainer(c, testContainerOptions{

 		command: makeCatFileCommand("/testDir/file1-1"),

@@ -322,9 +331,10 @@ func (s *DockerCLICpSuite) TestCpToCaseH(c *testing.T) {

 	assert.NilError(c, containerStartOutputEquals(c, containerID, "file1-1\n"), "Should now contain file1-1's contents")

 }

-// I. SRC specifies a directory's contents only and DST exists as a file. This

-//    should cause an error as it is not possible to overwrite a file with a

-//    directory.

+// I. SRC specifies a directory's contents only and DST exists as a file.

+//

+// This	should cause an error as it is not possible to overwrite a file with a

+// directory.

 func (s *DockerCLICpSuite) TestCpToCaseI(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{

@@ -345,9 +355,10 @@ func (s *DockerCLICpSuite) TestCpToCaseI(c *testing.T) {

 }

 // J. SRC specifies a directory's contents only and DST exists as a directory.

-//    This should copy the contents of the SRC directory (but not the directory

-//    itself) into the DST directory. Ensure this works whether DST has a

-//    trailing path separator or not.

+//

+// This should copy the contents of the SRC directory (but not the directory

+// itself) into the DST directory. Ensure this works whether DST has a

+// trailing path separator or not.

 func (s *DockerCLICpSuite) TestCpToCaseJ(c *testing.T) {

 	testRequires(c, DaemonIsLinux)

 	containerID := makeTestContainer(c, testContainerOptions{

@@ -506,8 +506,7 @@ func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverGetEmptyResponse(c *

 // Ensure only cached paths are used in volume list to prevent N+1 calls to `VolumeDriver.Path`

 //

-// TODO(@cpuguy83): This test is testing internal implementation. In all the cases here, there may not even be a path

-// 	available because the volume is not even mounted. Consider removing this test.

+// TODO(@cpuguy83): This test is testing internal implementation. In all the cases here, there may not even be a path available because the volume is not even mounted. Consider removing this test.

 func (s *DockerExternalVolumeSuite) TestExternalVolumeDriverPathCalls(c *testing.T) {

 	s.d.Start(c)

 	assert.Equal(c, s.ec.paths, 0)

@@ -26,9 +26,9 @@ import (

 //

 // The format of /proc/self/mountinfo is like:

 //

-// 29 23 0:24 / /dev/shm rw,nosuid,nodev shared:4 - tmpfs tmpfs rw

-//       ^^^^\

-//            - this is the minor:major we look for

+//	29 23 0:24 / /dev/shm rw,nosuid,nodev shared:4 - tmpfs tmpfs rw

+//	^^^^\

+//	     - this is the minor:major we look for

 func testIpcCheckDevExists(mm string) (bool, error) {

 	f, err := os.Open("/proc/self/mountinfo")

 	if err != nil {

@@ -33,8 +33,8 @@ func (res *ExecResult) Combined() string {

 // Exec executes a command inside a container, returning the result

 // containing stdout, stderr, and exit code. Note:

-//  - this is a synchronous operation;

-//  - cmd stdin is closed.