Docker CLI - June [Rebased] #1

The test didn't do anything useful... - Despite its name it used newCreateCommand() instead of newConnectCommand() with create flags/options instead of connect. - There was no fake networkCreateFunc(), so the result of the 'connect' wasn't checked. - The fake networkConnectFunc() was never called, so didn't spot the problem. Signed-off-by: Rob Murray <[email protected]>

Support for connecting more than one network using the container run command was added in v25.0 for API > 1.44 - describe that in the docs. Signed-off-by: Rob Murray <[email protected]>

no changes to vendored code full diff: docker/docker-credential-helpers@v0.8.1...v0.8.2 Signed-off-by: Sebastiaan van Stijn <[email protected]>

- 0.14.1 release notes: https://github.com/docker/buildx/releases/tag/v0.14.1 - 0.14.0 release notes: https://github.com/docker/buildx/releases/tag/v0.14.0 - 0.13.1 release notes: https://github.com/docker/buildx/releases/tag/v0.13.1 - 0.13.0 release notes: https://github.com/docker/buildx/releases/tag/v0.13.0 Signed-off-by: Sebastiaan van Stijn <[email protected]>

release notes: https://github.com/docker/compose/releases/tag/v2.27.1 full diff: docker/compose@v2.24.3...v2.27.1 Signed-off-by: Sebastiaan van Stijn <[email protected]>

Update to the current version of Alpine, which is also the default for the golang:alpine image Signed-off-by: Sebastiaan van Stijn <[email protected]>

The output showed the Alpine version that was used for the example, which can get outdated and distracts from the example steps. Use --quiet to reduce the output, and to reduce maintenance (i.e., no need to keep the output updated with current versions). Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Rob Murray <[email protected]>

docs: use --quiet in example to simplify output

The github.com/containerd/containerd/platforms package was moved to a separate module in preparation of the containerd v2.0 release. Switch to the new module, which means we also remove containerd as a direct dependency. Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/docker/docker-credential-helpers v0.8.2

Dockerfile: update buildx to v0.14.1, compose v2.27.1

migrate to new github.com/containerd/platforms package

Dockerfile: update ALPINE_VERSION to 3.20

Signed-off-by: Albin Kerouanton <[email protected]>

docs: deprecate daemon's api-cors-header flag

Document CLI support for per interface sysctls

Signed-off-by: Sebastiaan van Stijn <[email protected]>

The CLI does not currently expose options to add custom metadata to contexts, but contexts support them. - update test-utilities to allow setting custom metadata - update the inspect test to verify that custom metadata is included when inspecting a context. - update the import/export tests to verify that custom metadata is preserved. Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Sebastiaan van Stijn <[email protected]>

cli/command/context: improve tests and add coverage for custom metadata in contexts

Docker Desktop currently ships with the "cloud integration" wrapper, which outputs an additional ContextType field in the JSON output. While this field is non-standard, it made its way into Visual Studio's Docker integration, which uses this to exclude "aci" and "eci" context types that are not supported by Visual Studio. This patch; - conditionally adds a ContextType field to the JSON output - but ONLY when using the default "{{json .}}" or "json" formats (which are the formats used by Visual Studio) - if the context is a "aci" or "eci" context, that type is preserved, otherwise the default "moby" type is used. Signed-off-by: Sebastiaan van Stijn <[email protected]>

context list: temporarily add ContextType to JSON output

- Fix compatibility with go1.22 - fileinfo: internally fix FileBasicInfo memory alignment (fixes compatibility with go1.22) - Switch from syscall to golang.org/x/sys/windows - Remove golang.org/x/mod as dependency - Remove golang.org/x/tools as dependency full diff: microsoft/go-winio@v0.6.1...v0.6.2 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/Microsoft/go-winio v0.6.2 (for go1.22 compatibility)

full diff: opencontainers/image-spec@v1.1.0-rc5...v1.1.0 Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: microsoft/hcsshim@v0.11.4...v0.11.5 Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: moby/moby@06e3a49...e622cea Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: twelsh-aw <[email protected]> Keep pinging desired individuals for certain changes, but allow others to keep reviewing in accordance with org Branch Protection rules (note: runtime-owners team has notifications disabled)

vendor: github.com/docker/docker e622cea55698 (master / v27.0.0-dev)

Update CODEOWNERS

v3 is using Node.js 16 which are being deprecated: Node.js 16 actions are deprecated. Please update the following actions to use Node.js 20: actions/upload-artifact@v3. For more information see: https://github.blog/changelog/2023-09-22-github-actions-transitioning-from-node-16-to-node-20/. ci: incl. platform pair in artifact name This fixes an the issue w/ `upload-artifact@v4`. See: https://github.blog/2024-02-12-get-started-with-v4-of-github-actions-artifacts/#compatibility Co-authored-by: Laura Brehm <[email protected]> Signed-off-by: Laura Brehm <[email protected]> Signed-off-by: Sebastiaan van Stijn <[email protected]>

gha: update to actions/upload-artifact@v4

Signed-off-by: Casey Korver <[email protected]>

full diff: moby/moby@e622cea...cd38046 Signed-off-by: Sebastiaan van Stijn <[email protected]>

Correct typos in comments in the `cli/` folder

vendor: github.com/docker/docker cd3804655a25 (master / v27.0.0-dev)

The completion functions only need the API-client, and not all of the CLI. However, passing the API-client as argument would mean that the API-client is initialized early, which may not be what we want, so instead, defining an APIClientProvider interface to preserve the behavior of initializing when needed only. While updating, also simplify stack.format to only require an io.Writer. Signed-off-by: Sebastiaan van Stijn <[email protected]>

cli/command: use shallower interface for completions

no changes in vendored code full diff: cncf-tags/container-device-interface@v0.6.2...v0.7.2 Signed-off-by: Sebastiaan van Stijn <[email protected]>

no changes in vendored code full diff: containerd/containerd@v1.7.15...v1.7.17 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/containerd/containerd v1.7.17

go1.21.11 (released 2024-06-04) includes security fixes to the archive/zip and net/netip packages, as well as bug fixes to the compiler, the go command, the runtime, and the os package. See the Go 1.21.11 milestone on our issue tracker for details; - https://github.com/golang/go/issues?q=milestone%3AGo1.21.11+label%3ACherryPickApproved - full diff: golang/go@go1.21.10...go1.21.11 From the security announcement; We have just released Go versions 1.22.4 and 1.21.11, minor point releases. These minor releases include 2 security fixes following the security policy: - archive/zip: mishandling of corrupt central directory record The archive/zip package's handling of certain types of invalid zip files differed from the behavior of most zip implementations. This misalignment could be exploited to create an zip file with contents that vary depending on the implementation reading the file. The archive/zip package now rejects files containing these errors. Thanks to Yufan You for reporting this issue. This is CVE-2024-24789 and Go issue https://go.dev/issue/66869. - net/netip: unexpected behavior from Is methods for IPv4-mapped IPv6 addresses The various Is methods (IsPrivate, IsLoopback, etc) did not work as expected for IPv4-mapped IPv6 addresses, returning false for addresses which would return true in their traditional IPv4 forms. Thanks to Enze Wang of Alioth and Jianjun Chen of Zhongguancun Lab for reporting this issue. This is CVE-2024-24790 and Go issue https://go.dev/issue/67680. Signed-off-by: Sebastiaan van Stijn <[email protected]>

update to go1.21.11

no changes to vendored files full diff: containerd/containerd@v1.7.17...v1.7.18 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/containerd/containerd v1.7.18

- api: move more network-related types to api/types/network full diff: moby/moby@cd38046...c6aaabc Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/docker/docker c6aaabc9fc82 (master / v27.0.0-dev)

github.com/mitchellh/mapstructure will no longer be maintained by the author, and github.com/go-viper/mapstructure is nominated as the endorsed fork. - v1.x changes since last release from mitchellh: go-viper/mapstructure@v1.5.0...v1.6.0 - v2.0 changes: go-viper/mapstructure@v1.6.0...v2.0.0 Breaking changes Error is removed in favor of errors.Join (backported from Go 1.20 to preserve compatibility with earlier versions) What's Changed - feat!: update module path - build: update dev env - feature: add StringToBasicTypeHookFunc and support complex - Add an example showing how to use a DecodeHookFunc to parse a custom field. - Remove exposed error type - Replace internal joined error with errors.Join Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Casey Korver <[email protected]>

Correct typos in `docs/` and `man/`

- api: Make EnableIPv6 optional full diff: moby/moby@c6aaabc...00f18ef Signed-off-by: Albin Kerouanton <[email protected]>

The API field `EnableIPv6` was marked as optional in our Swagger docs, and its default value in the Go client came from that field being a bool, thus defaulting to its zero value. That's not the case anymore. This field is now a `*bool` as to let daemon's config define the default value. IPv6 can still be enabled / disabled by explicitly specifying the `--ipv6` flag when doing `docker network create`. Signed-off-by: Albin Kerouanton <[email protected]>

network create: make --ipv6 optional

Add a minimal test to verify values are handled correctly. Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Rob Murray <[email protected]>

These are endpoint-specific driver options... services: myservice: image: myimage networks: mynet: driver_opts: "option1": "value1" The API has had support for a long time, it's only recently been added to compose (unreleased right now). Signed-off-by: Rob Murray <[email protected]>

cli/command/network: add minimal test for --ipv6 option

Handle networks.driver_opts for a service

full diff: moby/moby@181e70c...59996a4 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/docker/docker 59996a493cfc (v27.0.0-dev)

Signed-off-by: Alano Terblanche <[email protected]>

Signed-off-by: Nick Sieger <[email protected]>

cli/command: more go1.19 ("predeclared any")

full diff: distribution/reference@v0.5.0...v0.6.0 - remove deprecated SplitHostname - refactor splitDockerDomain to include more documentation - fix typo in readme - Exclude domain from name length check Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/distribution/reference v0.6.0

feat: global signal handling to cancel ctx for graceful exits

Signed-off-by: Sebastiaan van Stijn <[email protected]>

Rename some variables to prevent shadowing and for clarity. Also made some minor formatting changes. Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: moby/moby@59996a4...a736d07 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/docker/docker a736d0701c41 (master, v27.0.0-dev)

Rename variable that shadowed an import, and pass the network API-client instead of the whole CLI Signed-off-by: Sebastiaan van Stijn <[email protected]>

internal/test/cli.go:175:14: fmt.Errorf can be replaced with errors.New (perfsprint) return nil, fmt.Errorf("no notary client available unless defined") ^ cli/command/cli.go:318:29: fmt.Errorf can be replaced with errors.New (perfsprint) return docker.Endpoint{}, fmt.Errorf("no context store initialized") ^ cli/command/container/attach.go:161:11: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf(result.Error.Message) ^ cli/command/container/opts.go:577:16: fmt.Errorf can be replaced with errors.New (perfsprint) return nil, fmt.Errorf("--health-start-period cannot be negative") ^ cli/command/container/opts.go:580:16: fmt.Errorf can be replaced with errors.New (perfsprint) return nil, fmt.Errorf("--health-start-interval cannot be negative") ^ cli/command/container/stats.go:221:11: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("filtering is not supported when specifying a list of containers") ^ cli/command/container/attach_test.go:82:17: fmt.Errorf can be replaced with errors.New (perfsprint) expectedErr = fmt.Errorf("unexpected error") ^ cli/command/container/create_test.go:234:40: fmt.Errorf can be replaced with errors.New (perfsprint) return container.CreateResponse{}, fmt.Errorf("shouldn't try to pull image") ^ cli/command/container/list_test.go:150:17: fmt.Errorf can be replaced with errors.New (perfsprint) return nil, fmt.Errorf("error listing containers") ^ cli/command/container/rm_test.go:40:31: fmt.Errorf can be replaced with errors.New (perfsprint) return errdefs.NotFound(fmt.Errorf("Error: no such container: " + container)) ^ cli/command/container/run_test.go:138:40: fmt.Errorf can be replaced with errors.New (perfsprint) return container.CreateResponse{}, fmt.Errorf("shouldn't try to pull image") ^ cli/command/image/pull_test.go:115:49: fmt.Errorf can be replaced with errors.New (perfsprint) return io.NopCloser(strings.NewReader("")), fmt.Errorf("shouldn't try to pull image") ^ cli/command/network/connect.go:88:16: fmt.Errorf can be replaced with errors.New (perfsprint) return nil, fmt.Errorf("invalid key/value pair format in driver options") ^ cli/command/plugin/create_test.go:96:11: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("Error creating plugin") ^ cli/command/plugin/disable_test.go:32:12: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("Error disabling plugin") ^ cli/command/plugin/enable_test.go:32:12: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("failed to enable plugin") ^ cli/command/plugin/inspect_test.go:55:22: fmt.Errorf can be replaced with errors.New (perfsprint) return nil, nil, fmt.Errorf("error inspecting plugin") ^ cli/command/plugin/install_test.go:43:17: fmt.Errorf can be replaced with errors.New (perfsprint) return nil, fmt.Errorf("Error installing plugin") ^ cli/command/plugin/install_test.go:51:17: fmt.Errorf can be replaced with errors.New (perfsprint) return nil, fmt.Errorf("(image) when fetching") ^ cli/command/plugin/install_test.go:95:17: fmt.Errorf can be replaced with errors.New (perfsprint) return nil, fmt.Errorf("should not try to install plugin") ^ cli/command/plugin/list_test.go:35:41: fmt.Errorf can be replaced with errors.New (perfsprint) return types.PluginsListResponse{}, fmt.Errorf("error listing plugins") ^ cli/command/plugin/remove_test.go:27:12: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("Error removing plugin") ^ cli/command/registry/login_test.go:36:46: fmt.Errorf can be replaced with errors.New (perfsprint) return registrytypes.AuthenticateOKBody{}, fmt.Errorf("Invalid Username or Password") ^ cli/command/registry/login_test.go:44:46: fmt.Errorf can be replaced with errors.New (perfsprint) return registrytypes.AuthenticateOKBody{}, fmt.Errorf(errUnknownUser) ^ cli/command/system/info.go:190:10: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("errors pretty printing info") ^ cli/command/system/prune.go:77:10: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf(`ERROR: The "until" filter is not supported with "--volumes"`) ^ cli/command/system/version_test.go:19:28: fmt.Errorf can be replaced with errors.New (perfsprint) return types.Version{}, fmt.Errorf("no server") ^ cli/command/trust/key_load.go:112:22: fmt.Errorf can be replaced with errors.New (perfsprint) return []byte{}, fmt.Errorf("could not decrypt key") ^ cli/command/trust/revoke.go:44:10: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("cannot use a digest reference for IMAGE:TAG") ^ cli/command/trust/revoke.go:105:10: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("no signed tags to remove") ^ cli/command/trust/signer_add.go:56:10: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("releases is a reserved keyword, please use a different signer name") ^ cli/command/trust/signer_add.go:60:10: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("path to a public key must be provided using the `--key` flag") ^ opts/config.go:71:10: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("source is required") ^ opts/mount.go:168:10: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("type is required") ^ opts/mount.go:172:10: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("target is required") ^ opts/network.go:90:11: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("network name/id is not specified") ^ opts/network.go:129:18: fmt.Errorf can be replaced with errors.New (perfsprint) return "", "", fmt.Errorf("invalid key value pair format in driver options") ^ opts/opts.go:404:13: fmt.Errorf can be replaced with errors.New (perfsprint) return 0, fmt.Errorf("value is too precise") ^ opts/opts.go:412:18: fmt.Errorf can be replaced with errors.New (perfsprint) return "", "", fmt.Errorf("empty string specified for links") ^ opts/parse.go:84:37: fmt.Errorf can be replaced with errors.New (perfsprint) return container.RestartPolicy{}, fmt.Errorf("invalid restart policy format: no policy provided before colon") ^ opts/parse.go:89:38: fmt.Errorf can be replaced with errors.New (perfsprint) return container.RestartPolicy{}, fmt.Errorf("invalid restart policy format: maximum retry count must be an integer") ^ opts/port.go:105:13: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("hostip is not supported") ^ opts/secret.go:70:10: fmt.Errorf can be replaced with errors.New (perfsprint) return fmt.Errorf("source is required") ^ opts/env_test.go:57:11: fmt.Errorf can be replaced with errors.New (perfsprint) err: fmt.Errorf("invalid environment variable: =a"), ^ opts/env_test.go:93:11: fmt.Errorf can be replaced with errors.New (perfsprint) err: fmt.Errorf("invalid environment variable: ="), ^ cli-plugins/manager/error_test.go:16:11: fmt.Errorf can be replaced with errors.New (perfsprint) inner := fmt.Errorf("testing") ^ Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Sebastiaan van Stijn <[email protected]>

…print) cli/registry/client/endpoint.go:128:34: fmt.Sprintf can be replaced with string concatenation (perfsprint) req.Header.Set("Authorization", fmt.Sprintf("Bearer %s", th.token)) ^ cli/command/telemetry_docker.go:88:14: fmt.Sprintf can be replaced with string concatenation (perfsprint) endpoint = fmt.Sprintf("unix://%s", path.Join(u.Host, u.Path)) ^ cli/command/cli_test.go:195:47: fmt.Sprintf can be replaced with string concatenation (perfsprint) opts := &flags.ClientOptions{Hosts: []string{fmt.Sprintf("unix://%s", socket)}} ^ cli/command/registry_test.go:59:24: fmt.Sprintf can be replaced with string concatenation (perfsprint) inputServerAddress: fmt.Sprintf("https://%s", testAuthConfigs[1].ServerAddress), ^ cli/command/container/opts_test.go:338:35: fmt.Sprintf can be replaced with string concatenation (perfsprint) if config, _, _ := mustParse(t, fmt.Sprintf("--hostname=%s", hostname)); config.Hostname != expectedHostname { ^ cli/command/context/options.go:79:24: fmt.Sprintf can be replaced with string concatenation (perfsprint) errs = append(errs, fmt.Sprintf("%s: unrecognized config key", k)) ^ cli/command/image/build.go:461:68: fmt.Sprintf can be replaced with string concatenation (perfsprint) line = dockerfileFromLinePattern.ReplaceAllLiteralString(line, fmt.Sprintf("FROM %s", reference.FamiliarString(trustedRef))) ^ cli/command/image/remove_test.go:21:9: fmt.Sprintf can be replaced with string concatenation (perfsprint) return fmt.Sprintf("Error: No such image: %s", n.imageID) ^ cli/command/image/build/context.go:229:102: fmt.Sprintf can be replaced with string concatenation (perfsprint) progReader := progress.NewProgressReader(response.Body, progressOutput, response.ContentLength, "", fmt.Sprintf("Downloading build context from remote url: %s", remoteURL)) ^ cli/command/service/logs.go:215:16: fmt.Sprintf can be replaced with string concatenation (perfsprint) taskName += fmt.Sprintf(".%s", task.ID) ^ cli/command/service/logs.go:217:16: fmt.Sprintf can be replaced with string concatenation (perfsprint) taskName += fmt.Sprintf(".%s", stringid.TruncateID(task.ID)) ^ cli/command/service/progress/progress_test.go:877:18: fmt.Sprintf can be replaced with string concatenation (perfsprint) ID: fmt.Sprintf("task%s", nodeID), ^ cli/command/stack/swarm/remove.go:61:24: fmt.Sprintf can be replaced with string concatenation (perfsprint) errs = append(errs, fmt.Sprintf("Failed to remove some resources from stack: %s", namespace)) ^ cli/command/swarm/ipnet_slice_test.go:32:9: fmt.Sprintf can be replaced with string concatenation (perfsprint) arg := fmt.Sprintf("--cidrs=%s", strings.Join(vals, ",")) ^ cli/command/swarm/ipnet_slice_test.go:137:30: fmt.Sprintf can be replaced with string concatenation (perfsprint) if err := f.Parse([]string{fmt.Sprintf("--cidrs=%s", strings.Join(test.FlagArg, ","))}); err != nil { ^ cli/compose/schema/schema.go:105:11: fmt.Sprintf can be replaced with string concatenation (perfsprint) return fmt.Sprintf("must be a %s", humanReadableType(expectedType)) ^ cli/manifest/store/store.go:165:9: fmt.Sprintf can be replaced with string concatenation (perfsprint) return fmt.Sprintf("No such manifest: %s", n.object) ^ e2e/image/push_test.go:340:4: fmt.Sprintf can be replaced with string concatenation (perfsprint) fmt.Sprintf("NOTARY_ROOT_PASSPHRASE=%s", pwd), ^ e2e/image/push_test.go:341:4: fmt.Sprintf can be replaced with string concatenation (perfsprint) fmt.Sprintf("NOTARY_TARGETS_PASSPHRASE=%s", pwd), ^ e2e/image/push_test.go:342:4: fmt.Sprintf can be replaced with string concatenation (perfsprint) fmt.Sprintf("NOTARY_SNAPSHOT_PASSPHRASE=%s", pwd), ^ e2e/image/push_test.go:343:4: fmt.Sprintf can be replaced with string concatenation (perfsprint) fmt.Sprintf("NOTARY_DELEGATION_PASSPHRASE=%s", pwd), ^ e2e/plugin/trust_test.go:23:16: fmt.Sprintf can be replaced with string concatenation (perfsprint) pluginName := fmt.Sprintf("%s/plugin-content-trust", registryPrefix) ^ e2e/plugin/trust_test.go:53:8: fmt.Sprintf can be replaced with string concatenation (perfsprint) Out: fmt.Sprintf("Installed plugin %s", pluginName), ^ e2e/trust/revoke_test.go:62:57: fmt.Sprintf can be replaced with string concatenation (perfsprint) icmd.RunCommand("docker", "tag", fixtures.AlpineImage, fmt.Sprintf("%s:v1", revokeRepo)).Assert(t, icmd.Success) ^ e2e/trust/revoke_test.go:64:49: fmt.Sprintf can be replaced with string concatenation (perfsprint) icmd.Command("docker", "-D", "trust", "sign", fmt.Sprintf("%s:v1", revokeRepo)), ^ e2e/trust/revoke_test.go:68:58: fmt.Sprintf can be replaced with string concatenation (perfsprint) icmd.RunCommand("docker", "tag", fixtures.BusyboxImage, fmt.Sprintf("%s:v2", revokeRepo)).Assert(t, icmd.Success) ^ e2e/trust/revoke_test.go:70:49: fmt.Sprintf can be replaced with string concatenation (perfsprint) icmd.Command("docker", "-D", "trust", "sign", fmt.Sprintf("%s:v2", revokeRepo)), ^ e2e/trust/sign_test.go:36:47: fmt.Sprintf can be replaced with string concatenation (perfsprint) assert.Check(t, is.Contains(result.Stdout(), fmt.Sprintf("v1: digest: sha256:%s", fixtures.AlpineSha))) ^ e2e/trust/sign_test.go:53:47: fmt.Sprintf can be replaced with string concatenation (perfsprint) assert.Check(t, is.Contains(result.Stdout(), fmt.Sprintf("v1: digest: sha256:%s", fixtures.BusyboxSha))) ^ e2e/trust/sign_test.go:65:47: fmt.Sprintf can be replaced with string concatenation (perfsprint) assert.Check(t, is.Contains(result.Stdout(), fmt.Sprintf("v1: digest: sha256:%s", fixtures.AlpineSha))) ^ opts/file.go:21:9: fmt.Sprintf can be replaced with string concatenation (perfsprint) return fmt.Sprintf("poorly formatted environment: %s", e.msg) ^ opts/hosts_test.go:26:31: fmt.Sprintf can be replaced with string concatenation (perfsprint) "tcp://host:": fmt.Sprintf("tcp://host:%s", defaultHTTPPort), ^ Signed-off-by: Sebastiaan van Stijn <[email protected]>

Looks like it's broken, so use a blanket "nolint:gosec" instead; cli/command/image/build/context.go:238:17: G107: Potential HTTP request made with variable url (gosec) if resp, err = http.Get(url); err != nil { ^ Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: golangci/golangci-lint@v1.55.2...v1.59.0 Updated config to address warnings: WARN [config_reader] The configuration option `run.skip-files` is deprecated, please use `issues.exclude-files`. WARN [config_reader] The configuration option `linters.govet.check-shadowing` is deprecated. Please enable `shadow` instead, if you are not using `enable-all`. Signed-off-by: Sebastiaan van Stijn <[email protected]>

update golangci-lint to .v1.59.0 and fix linting issues

Signed-off-by: Sebastiaan van Stijn <[email protected]>

gha: switch to Ubuntu 24.04

full diff: moby/moby@a736d07...9d94884 Signed-off-by: Paweł Gronowski <[email protected]>

Signed-off-by: Paweł Gronowski <[email protected]>

Print note when the multi-platform image was reduced to a single manifest. Signed-off-by: Paweł Gronowski <[email protected]>

Signed-off-by: Grace Choi <[email protected]> Signed-off-by: Pranjal Rai <[email protected]> Signed-off-by: Sebastiaan van Stijn <[email protected]>

The `Config` field returned by this endpoint (used for "image inspect") returns additional fields that are not part of the image's configuration and not part of the [Docker Image Spec] and the [OCI Image Spec]. These additional fields are included in the response, due to an implementation detail, where the [api/types.ImageInspec] type used for the response is using the [container.Config] type. The [container.Config] type is a superset of the image config, and while the image's Config is used as a _template_ for containers created from the image, the additional fields are set at runtime (from options passed when creating the container) and not taken from the image Config. These fields are never set (and always return the default value for the type), but are not omitted in the response when left empty. As these fields were not intended to be part of the image configuration response, they are deprecated, and will be removed from the API. The following fields are currently included in the API response, but are not part of the underlying image's Config, and deprecated: - `Hostname` - `Domainname` - `AttachStdin` - `AttachStdout` - `AttachStderr` - `Tty` - `OpenStdin` - `StdinOnce` - `Image` - `NetworkDisabled` (already omitted unless set) - `MacAddress` (already omitted unless set) - `StopTimeout` (already omitted unless set) [Docker image spec]: https://github.com/moby/docker-image-spec/blob/v1.3.1/specs-go/v1/image.go#L19-L32 [OCI Image Spec]: https://github.com/opencontainers/image-spec/blob/v1.1.0/specs-go/v1/config.go#L24-L62 [api/types.ImageInspec]: https://github.com/moby/moby/blob/v26.1.4/api/types/types.go#L87-L104 [container.Config]: https://github.com/moby/moby/blob/v26.1.4/api/types/container/config.go#L47-L82 Signed-off-by: Sebastiaan van Stijn <[email protected]>

cli/push: Add `platform` switch

This wraps the cli stderr stream the same way as stdin and stdout, which extends the stream with TTY-related methods. Signed-off-by: Paweł Gronowski <[email protected]>

Signed-off-by: Marius Meschter <[email protected]>

Removed all mentions of "please" from docs and messages

- Remove hcsshim import from repo - un-exports GetOsVersion - Update windows matcher to not compare empty os version full diff: containerd/platforms@v0.2.0...v0.2.1 Signed-off-by: Sebastiaan van Stijn <[email protected]>

These were deprecated in 46afd26 in v26.0, and have no known users. Signed-off-by: Sebastiaan van Stijn <[email protected]>

cli/command/registry: fix link to credential stores

cli: Wrap Err stream

vendor: github.com/containerd/platforms v0.2.1

Since 509123f, we've been leaking sockets in the filesystem on platforms where abstract sockets aren't supported. That change relied on Go to cleanup our sockets for us, which Go will happily do as long as we make sure to close the listener, which we weren't previously doing unless to signal the plugin to terminate. This change adds a deferred call to `PluginServer.Close()`, which makes sure we close the plugin server at the end of the plugin execution, so that we never exit without cleaning up. Signed-off-by: Laura Brehm <[email protected]>

cli/command: remove deprecated EventHandler, InitEventHandler

No work has started yet on the deprecation, so extending the time- window. Signed-off-by: Sebastiaan van Stijn <[email protected]>

Deprecate non-standard (config) fields in image inspect output

docs: extend deprecation target for non-TLS API

full diff: moby/moby@9d94884...bcd280a Signed-off-by: Paweł Gronowski <[email protected]>

vendor: github.com/docker/docker v27.0.0-dev (bcd280a3ed2d)

plugins: cleanup sockets when done

no changes in vendored code full diff: moby/moby@bcd280a...v27.0.0-rc.1 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/docker/docker v27.0.0-rc.1

full diff: golang/sys@v0.18.0...v0.19.0 Signed-off-by: Sebastiaan van Stijn <[email protected]>

no changes in vendored code full diff: golang/term@v0.18.0...v0.19.0 Signed-off-by: Sebastiaan van Stijn <[email protected]>

no changes in vendored code full diff: golang/crypto@v0.21.0...v0.22.0 Signed-off-by: Sebastiaan van Stijn <[email protected]>

no changes in vendored code full diff: golang/net@v0.23.0...v0.24.0 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: golang.org/x/sys v0.19.0, golang.org/x/term v0.19.0, golang.org/x/crypto v0.22.0, golang.org/x/net v0.24.0

Commit 27b2797 added a local implementation of this function, so let's use the local variant to (slightly) reduce the dependency on moby's registry package. Also made some minor cleanups. Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: moby/moby@v27.0.0-rc.1...ba69bd9 Signed-off-by: Paweł Gronowski <[email protected]>

vendor: github.com/docker/docker ba69bd9c1e48 (v27.0.0-rc.2-dev)

full diff: moby/moby@ba69bd9...ec4bac4 Signed-off-by: Paweł Gronowski <[email protected]>

vendor: github.com/docker/docker ec4bac431c88 (v27.0.0-dev)

full diff: moby/moby@ec4bac4...caf502a Signed-off-by: Paweł Gronowski <[email protected]>

vendor: github.com/docker/docker caf502a0bc44 (v27.0.0-dev)

Bumps [docker/bake-action](https://github.com/docker/bake-action) from 4 to 5. - [Release notes](https://github.com/docker/bake-action/releases) - [Commits](docker/bake-action@v4...v5) --- updated-dependencies: - dependency-name: docker/bake-action dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] <[email protected]>

…/bake-action-5 build(deps): bump docker/bake-action from 4 to 5

Before this: make shell make -C ./internal/gocompat/ ... GO111MODULE=on go test -v # github.com/docker/cli/cli/command/image ../../cli/command/image/push.go:177:62: predeclared any requires go1.18 or later (-lang was set to go1.16; check go.mod) FAIL gocompat [build failed] make: *** [Makefile:3: verify] Error 1 make: Leaving directory '/go/src/github.com/docker/cli/internal/gocompat' After this patch: make shell make -C ./internal/gocompat/ ... GO111MODULE=on go test -v === RUN TestModuleCompatibllity main_test.go:133: all packages have the correct go version specified through //go:build --- PASS: TestModuleCompatibllity (0.00s) PASS ok gocompat 0.007s make: Leaving directory '/go/src/github.com/docker/cli/internal/gocompat' Signed-off-by: Sebastiaan van Stijn <[email protected]>

cli/command/image: add go:build tag to prevent downgrading go version

Match the minimum version that's specified on our vendor.mod. Signed-off-by: Sebastiaan van Stijn <[email protected]>

Update go:build comments to go1.21

This file is only used as default if no version is specified. We should probably get rid of this, but let's update it to better reflect the version that developer builds are building. Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Sebastiaan van Stijn <[email protected]>

bump version to v27.0.1-dev

No diff as it's the same commit, but tagged. Just for transparency to allow seeing differences between rc's. full diff: moby/moby@caf502a...v27.0.0-rc.2 Signed-off-by: Sebastiaan van Stijn <[email protected]>

Update the version to match what's used in docker/docker. Full diff: moby/swarmkit@c1c857e...ea1a7ce Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/docker/docker v27.0.0-rc.2

gha: e2e: test against v27.0 release candidates

vendor: github.com/moby/swarmkit/v2 v2.0.0-20240611172349-ea1a7cec35cb

…lation Signed-off-by: Alano Terblanche <[email protected]>

Signed-off-by: Sebastiaan van Stijn <[email protected]>

[Graphdriver plugins] are an experimental feature that allow extending the Docker Engine with custom storage drivers for storing images and containers. This feature was not maintained since its inception, and will no longer be supported in upcoming releases. Users of this feature are recommended to instead configure the Docker Engine to use the [containerd image store], and a custom [snapshotter]. [Graphdriver plugins]: https://github.com/docker/cli/blob/v26.1.4/docs/extend/plugins_graphdriver.md [containerd image store]: https://github.com/docker/docs/blob/31a16f1da2f4a4c94b5a82713aa012f052fb7e6d/content/storage/containerd.md [snapshotter]: https://github.com/containerd/containerd/tree/v1.7.18/docs/snapshotters Signed-off-by: Sebastiaan van Stijn <[email protected]>

Deprecate experimental graphdriver plugins

This is the version used in the dev-container, and for testing. release notes: https://github.com/docker/buildx/releases/tag/v0.15.1 Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: cpuguy83/go-md2man@v2.0.4...v2.0.4 Signed-off-by: Sebastiaan van Stijn <[email protected]>

- release notes: https://github.com/spf13/cobra/releases/tag/v1.8.1 - full diff: spf13/cobra@v1.8.0...v1.8.1 Signed-off-by: Sebastiaan van Stijn <[email protected]>

…Dirs Add some documentation about their purpose, and document order of preference when resolving plugins. Signed-off-by: Sebastiaan van Stijn <[email protected]>

Commit 6fef143 switched the CLI to use BuildKit by default, but as part of that removed the use of the BuildkitVersion field as returned by Ping. Some follow-up changes in commits e38e6c5 and e7a8748 updated the logic for detecting whether BuildKit should be used or the legacy builder, but hard-coded using the legacy builder for Windows daemons. While Windows / WCOW does not yet support BuildKit by default, there is work in progress to implement it, so we should not hard-code the assumption that a Windows daemon cannot support BuildKit. On the daemon-side, [moby@7b153b9] (Docker v23.0) changed the default as advertised by the daemon to be BuildKit for Linux daemons. That change still hardcoded BuildKit to be unsupported for Windows daemons (and does not yet allow overriding the config), but this may change for future versions of the daemon, or test-builds. This patch: - Re-introduces checks for the BuildkitVersion field in the "Ping" response. - If the Ping response from the daemon advertises that it supports BuildKit, the CLI will now use BuildKit as builder. - If we didn't get a Ping response, or the Ping response did NOT advertise that the daemon supported BuildKit, we continue to use the current defaults (BuildKit for Linux daemons, and the legacy builder for Windows) - Handling of the DOCKER_BUILDKIT environment variable is unchanged; for CLI.BuildKitEnabled, DOCKER_BUILDKIT always takes precedence, and for processBuilder the value is taken into account, but will print a warning when BuildKit is disabled and a Linux daemon is used. For Windows daemons, no warning is printed. [moby@7b153b9]: moby/moby@7b153b9 Signed-off-by: Sebastiaan van Stijn <[email protected]>

Dockerfile: update buildx to v0.15.1

update go-md2man to v2.0.4

vendor: github.com/spf13/cobra v1.8.1

cli-plugins/manager: add GoDoc for getPluginDirs, defaultSystemPluginDirs

Signed-off-by: Iain MacDonald <[email protected]>

Signed-off-by: Iain MacDonald <[email protected]> Signed-off-by: Paweł Gronowski <[email protected]>

Fix RFC3339 typo in docs

Rewrite local code to use the new container.Ulimit alias to start transitioning away from direct uses of go-units.Ulimit. full diff: moby/moby@v27.0.0-rc.2...1a1f3cf Signed-off-by: Sebastiaan van Stijn <[email protected]>

Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/docker/docker 1a1f3cff45ec (master, v27.0-dev)

update mailmap and AUTHORS

full diff: moby/moby@1a1f3cf...018d93d Signed-off-by: Paweł Gronowski <[email protected]>

Signed-off-by: Alano Terblanche <[email protected]>

The embedded `client.Client` has mutexes and it shouldn't be copied. Signed-off-by: Paweł Gronowski <[email protected]>

vendor: github.com/docker/docker v27.0-dev (018d93decfb5)

use local ConvertToHostname() implementation

Signed-off-by: Alano Terblanche <[email protected]>

fix: force cli to exit after third sigint/sigterm

build: allow BuildKit to be used on Windows daemons that advertise it

no diff; same commit, but tagged. full diff: moby/moby@018d93d...v27.0.1-rc.1 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/docker/docker v27.0.1-rc.1

release notes: https://github.com/docker/compose/releases/tag/v2.28.0 full diff: docker/compose@v2.27.1...v2.28.0 Signed-off-by: Sebastiaan van Stijn <[email protected]>

Add a mention of the feature being disabled by default, and the DOCKERD_DEPRECATED_GRAPHDRIVER_PLUGINS env-var. Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: moby/moby@81b2027...ff1e2c0 Signed-off-by: Paweł Gronowski <[email protected]>

docs/deprecated: update status for graphdriver-plugins

vendor: github.com/docker/docker v27.0-dev (ff1e2c0de72a, master)

Dockerfile: update compose to v2.28.0

There's some consumers of the config package that don't need any of the other parts of the code, but because of the pkg/homedir were now forced to also depend on docker/docker. This patch introduces a local copy of the function to prevent this. Signed-off-by: Sebastiaan van Stijn <[email protected]>

cli/config: replace pkg/homedir dependency with local copy

Signed-off-by: Sebastiaan van Stijn <[email protected]>

cli: make initializing the global meter- and tracing providers optional

full diff: golangci/golangci-lint@v1.59.0...v1.59.1 Signed-off-by: Sebastiaan van Stijn <[email protected]>

27.0 is out - update the latest version used for e2e and drop the 25.0 Signed-off-by: Paweł Gronowski <[email protected]>

update golangci-lint to v1.59.1

Signed-off-by: Carston Schilds <[email protected]>

re-introduced support for port numbers in docker registry URL

Signed-off-by: Sebastiaan van Stijn <[email protected]>

cli/config/credentials: ConvertToHostname: handle IP-addresses

gha/e2e: Update latest version to 27.0

no change in vendored files, just changing a tag full diff: moby/moby@ff1e2c0...v27.0.1 Signed-off-by: Paweł Gronowski <[email protected]> (cherry picked from commit bf1a701) Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: moby/moby@v27.0.1...861fde8 Signed-off-by: Paweł Gronowski <[email protected]> (cherry picked from commit 8945848) Signed-off-by: Sebastiaan van Stijn <[email protected]>

full diff: moby/moby@861fde8...e953d76 Signed-off-by: Paweł Gronowski <[email protected]> (cherry picked from commit c97e809) Signed-off-by: Sebastiaan van Stijn <[email protected]>

no diff, as it's the same commit tagged: moby/moby@e953d76...v27.0.2 Signed-off-by: Sebastiaan van Stijn <[email protected]>

vendor: github.com/docker/docker v27.0.2

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Docker CLI - June [Rebased] #1

Docker CLI - June [Rebased] #1

Commits on May 8, 2024

Commits on May 23, 2024

Commits on May 26, 2024

Commits on May 27, 2024

Commits on May 28, 2024

Commits on May 29, 2024

Commits on May 31, 2024

Commits on Jun 1, 2024

Commits on Jun 3, 2024

Commits on Jun 4, 2024

Commits on Jun 5, 2024

Commits on Jun 6, 2024

Commits on Jun 7, 2024

Commits on Jun 8, 2024

Commits on Jun 9, 2024

Commits on Jun 10, 2024

Commits on Jun 11, 2024

Commits on Jun 12, 2024

Commits on Jun 13, 2024

Commits on Jun 14, 2024

Commits on Jun 17, 2024

Commits on Jun 18, 2024

Commits on Jun 19, 2024

Commits on Jun 20, 2024

Commits on Jun 21, 2024

Commits on Jun 24, 2024

Commits on Jun 25, 2024

Commits on Jun 26, 2024

Commits on Jun 28, 2024