11208 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sebastiaan van Stijn	3f154adf70	Merge pull request #5877 from thaJeztah/remove_redundant_ParseRepositoryInfo ... cli/command/manifest: remove redundant uses of ParseRepositoryInfo	2025-03-03 11:36:16 +01:00
Sebastiaan van Stijn	c7072a885d	cli/command/image: rename vars that shadowed type ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-03-02 14:16:38 +01:00
Sebastiaan van Stijn	7a6270d190	cli/command/image: move AddTargetToAllSignableRoles to cli/trust ... This utility was shared between the "image" and "trust" packages, and a shallow wrapper around features in the cli/trust package. Move it there instead and rename it to `trust.AddToAllSignableRoles`. There are no known external consumers of this utility, so skipping a deprecation. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-03-02 14:16:38 +01:00
Sebastiaan van Stijn	d95385057f	cli/command/trust: use gotest.tools in tests ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-03-02 14:16:37 +01:00
Sebastiaan van Stijn	e6382db10e	cli/command/image: move trust unit-tests to trust package ... These tests were not testing functionality that was implemented in the image package. Move them to the trust package, where they belong. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-03-02 14:16:37 +01:00
Sebastiaan van Stijn	55bc30a784	cli/command/image: use t.SetEnv in trust tests ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-03-02 14:16:37 +01:00
Sebastiaan van Stijn	049f84c94d	cli/command/image: remove TestAddTargetToAllSignableRolesError ... This test was only testing trust.GetSignableRoles to return an error if it's offline, which was duplicating the [TestGetSignableRolesError] test in the cli/trust package. [TestGetSignableRolesError]: https://github.com/docker/cli/blob/fe0a8d27912dc6fddc60cedcd35bbef27b776355/cli/trust/trust_test.go#L49-L55 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-03-02 14:16:37 +01:00
Sebastiaan van Stijn	791bdf7b3c	cli/command/trust: add testPassRetriever helper ... Add a basic helper to provide the equivalent of passphrase.ConstantRetriever with a fixed passphrase for testing. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-03-02 14:16:32 +01:00
Sebastiaan van Stijn	1d8f87a2fb	cli/command/trust: remove TestGetSignableRolesForTargetAndRemoveError ... This test was only testing trust.GetSignableRoles to return an error if it's offline, which was duplicating the [TestGetSignableRolesError] test. [TestGetSignableRolesError]: https://github.com/docker/cli/blob/fe0a8d27912dc6fddc60cedcd35bbef27b776355/cli/trust/trust_test.go#L49-L55 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-03-02 14:16:04 +01:00
Sebastiaan van Stijn	d4217eb205	cli/command/trust: remove TestGetOrGenerateNotaryKeyAndInitRepo ... This test was only testing trust.GetSignableRoles to return an error if it's offline, which was duplicating the [TestGetSignableRolesError] test. [TestGetSignableRolesError]: https://github.com/docker/cli/blob/fe0a8d27912dc6fddc60cedcd35bbef27b776355/cli/trust/trust_test.go#L49-L55 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-03-02 14:16:04 +01:00
Sebastiaan van Stijn	dd617b1464	cli/command/trust: remove unused passphrase-retriever from test ... The test only validates that an error is produced because the notary server is offline, and does not sent a passphrase. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-03-02 14:16:04 +01:00
Sebastiaan van Stijn	eae4c38023	internal/test/notary: add testPassRetriever helper ... Add a basic helper to provide the equivalent of passphrase.ConstantRetriever with a fixed passphrase for testing. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-03-02 14:15:57 +01:00
Sebastiaan van Stijn	eb82fe87a5	cli/trust: make NotaryServer a const ... This var used to be vendored from github.com/docker/docker/registry, but was removed there, and made a local var in a1cbaa827b. It is (and should never be) modified, so let's change it into a const. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-03-02 12:42:13 +01:00
Sebastiaan van Stijn	55a83aff23	cli/command/manifest: remove redundant uses of ParseRepositoryInfo ... [ParseRepositoryInfo] parses an image reference and returns information about the Repository and the registry. As part of this, it validates if the registry's hostname is considered valid using [ValidateIndexName], as well as normalizing the image reference to strip tags and digests using [reference.TrimNamed]. ValidateIndexName only provides very limited value; the only validation happening is to check for the hostname to not start, or end with a hyphen. The cli/command/manifest package used ParseRepositoryInfo in various locations where only the repository name was used (i.e., the result of `reference.TrimNamed` on the given reference), and in one location only used it to validate the registry name. For buildPushRequest, the call was fully redundant, as [RepoNameForReference] was used on the result, calling [newDefaultRepositoryEndpoint], which uses ParseRepositoryInfo internally, so we were only repeating that work. This patch removes uses of ParseRepositoryInfo in those places, and instead calling [reference.TrimNamed] directly. [ParseRepositoryInfo]: https://github.com/moby/moby/blob/41f781fab3cae181cc9be3ec93cd91b99466fa84/registry/config.go#L375-L381 [ValidateIndexName]: https://github.com/moby/moby/blob/41f781fab3cae181cc9be3ec93cd91b99466fa84/registry/config.go#L288-L299 [reference.TrimNamed]: https://github.com/moby/moby/blob/41f781fab3cae181cc9be3ec93cd91b99466fa84/registry/config.go#L369 [RepoNameForReference]: https://github.com/docker/cli/blob/fe0a8d27912dc6fddc60cedcd35bbef27b776355/cli/registry/client/endpoint.go#L107-L110 [newDefaultRepositoryEndpoint]: https://github.com/docker/cli/blob/fe0a8d27912dc6fddc60cedcd35bbef27b776355/cli/registry/client/endpoint.go#L33-L38 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-03-01 15:40:29 +01:00
Sebastiaan van Stijn	fe0a8d2791	Merge pull request #5842 from jsternberg/otel-resource-attributes-merge ... cli-plugins: merge OTEL_RESOURCE_ATTRIBUTES environment variable	2025-02-28 10:45:17 +01:00
Sebastiaan van Stijn	b414752ef8	Merge pull request #5851 from thaJeztah/err_handle_explicit ... explicitly handle errors when wrapping them	2025-02-26 16:23:35 +01:00
Sebastiaan van Stijn	7b78eabcab	Merge pull request #5872 from vvoland/vendor-docker ... vendor: github.com/docker/docker v28.0.1	2025-02-26 15:40:13 +01:00
Paweł Gronowski	9e997a57fa	vendor: github.com/docker/docker v28.0.1 ... full diff: https://github.com/docker/docker/compare/af898abe4466...v28.0.1 Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2025-02-26 15:32:31 +01:00
Sebastiaan van Stijn	068a01ea94	Merge pull request #5870 from thaJeztah/carry_5855 ... Add detailed descriptions for --ulimit options in docker run documentation v28.0.1	2025-02-25 18:52:55 +01:00
MHM0098	d75f8d83d3	Add detailed descriptions for --ulimit options in docker run documentation ... Signed-off-by: MHM0098 <mhm98035@gmail.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-25 16:15:21 +01:00
Sebastiaan van Stijn	ffdfc5f94d	Merge pull request #5742 from mertssmnoglu/fix-dockerfile-exec-form ... fix/dockerfiles: Update CMD instruction in 'Dockerfile.dev' to use exec form	2025-02-25 15:59:09 +01:00
Paweł Gronowski	6bd9908388	Merge pull request #5867 from thaJeztah/bump_go_jose ... vendor: github.com/go-jose/go-jose/v4 v4.0.5	2025-02-25 13:03:21 +00:00
Sebastiaan van Stijn	75595836f2	vendor: github.com/go-jose/go-jose/v4 v4.0.5 ... - Don't allow unbounded amounts of splits. Fixes GHSA-c6gw-w398-hv78 / CVE-2025-27144 - Various other dependency updates, small fixes, and documentation updates in the full changelog full diff: https://github.com/go-jose/go-jose/compare/v4.0.4...v4.0.5 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-25 11:55:06 +01:00
Rob Murray	41277f53d5	Merge pull request #5865 from robmry/doc_default_bridge ... Update dockerd command line ref	2025-02-24 18:14:39 +00:00
Rob Murray	4e7497e9cf	Update dockerd command line ref, default bridge opts ... Signed-off-by: Rob Murray <rob.murray@docker.com>	2025-02-24 18:07:06 +00:00
Rob Murray	be669099cb	Update dockerd command line ref, changes in 28.0 ... Signed-off-by: Rob Murray <rob.murray@docker.com>	2025-02-24 18:07:06 +00:00
Paweł Gronowski	111468ccd6	Merge pull request #5864 from thaJeztah/gha_bump_docker ... gha: add docker 28 to test matrix	2025-02-24 16:39:27 +00:00
Sebastiaan van Stijn	427c1361c5	gha: add docker 28 to test matrix ... - set default to 28 - remove minor version from matrix; docker:dind images also provide a "docker:28-dind" which point to the latest minor version. - remove TODO for 19.03, which is really out of scope now. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-24 15:14:53 +01:00
Sebastiaan van Stijn	656523e20d	Merge pull request #5859 from thaJeztah/fix_docs ... docs: minor fixes and touch-ups for anchor links	2025-02-24 12:05:34 +01:00
Sebastiaan van Stijn	aad2ae50e8	docs: network ls add heading and anchor for "--no-trunc" ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-21 23:51:04 +01:00
Sebastiaan van Stijn	8a1b096e76	docs: fix missing anchors in swarm reference pages ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-21 23:46:07 +01:00
Sebastiaan van Stijn	c99d3312eb	docs: fix broken anchor-link in "container restart" reference ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-21 23:45:32 +01:00
Paweł Gronowski	77a8a8c6ca	Merge pull request #5854 from Benehiko/fix-exec-msg ... cmd/docker: do not print error status on exec/run	2025-02-21 12:20:31 +00:00
Alano TerblancheandFabio Pugliese Ornellas	0cff340983	cmd/docker: do not print error status on exec/run ... Co-authored-by: Fabio Pugliese Ornellas <fabio.ornellas@gmail.com> Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>	2025-02-21 12:55:57 +01:00
Bjorn Neergaard	eb48cad302	Merge pull request #5848 from thaJeztah/improve_swarm_completion ... completion: fix / add completion for service names and node-names	2025-02-20 12:24:31 -07:00
Sebastiaan van Stijn	2493a96027	Merge pull request #5850 from thaJeztah/fix_context_err ... cli/command/context: fix error-handling of skip-tls-verify	2025-02-20 18:37:04 +01:00
Sebastiaan van Stijn	8f55738579	completion: add completion for docker service flags ... Not all flags have completions yet, and for those that don't have completion, we disable completion to prevent it completing with filenames. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-20 18:33:17 +01:00
Sebastiaan van Stijn	768d10767f	completion: add completion for docker node flags ... With this patch: docker node update --role manager worker docker node update --availability active drain pause Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-20 18:33:17 +01:00
Sebastiaan van Stijn	d5e6e2ec6e	completion: add completion for node names ... Change completion for nodes to use names by default, and bring back support for the `DOCKER_COMPLETION_SHOW_NODE_IDS` env-var https://github.com/docker/cli/blob/f9ced58158d5e0b358052432244b483774a1983d/contrib/completion/bash/docker#L38 With this patch: docker node ps <tab> docker-desktop self export DOCKER_COMPLETION_SHOW_NODE_IDS=yes docker node ps <TAB> docker-desktop qyeriqk20al6hy4y869d08ff5 self Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-20 18:33:09 +01:00
Sebastiaan van Stijn	da4b6275ba	explicitly handle errors when wrapping them ... The errors.Wrap and errors.Wrapf functions gracefully handle nil-errors. This allows them to be used unconditionally regardless if an error was produced. While this can be convenient, it can also be err-prone, as replacing these with stdlib errors means they unconditionally produce an error. This patch replaces code uses of errors.Wrap to be gated by a check for nil-errors to future-proof our code. Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-20 18:10:36 +01:00
Sebastiaan van Stijn	7e71782ba6	cli/command/context: fix error-handling of skip-tls-verify ... Before 2b9a4d5f4c, this function would use "errors.Wrap" which returns nil if the original error was nil. fmt.Errorf does not do this, so without a nil check, it would unconditionally return an error; docker context create arm64 --docker host=ssh://172.17.101.26,skip-tls-verify=False unable to create docker endpoint config: name: %!w(<nil>) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-20 17:49:58 +01:00
Sebastiaan van Stijn	762d59359e	completion: use service names, and support DOCKER_COMPLETION_SHOW_SERVICE_IDS ... Change completion for services to use names by default, and bring back support for the `DOCKER_COMPLETION_SHOW_SERVICE_IDS` env-var https://github.com/docker/cli/blob/f9ced58158d5e0b358052432244b483774a1983d/contrib/completion/bash/docker#L41-L43 Before this patch: docker service ps c9vrp2pwni9gx5ghat20rjpcy hmthf0tqws9xpmd87ok7diqly With this patch: docker service ps<TAB> databaseservice webservice export DOCKER_COMPLETION_SHOW_SERVICE_IDS=yes docker service ps<TAB> c9vrp2pwni9gx5ghat20rjpcy databaseservice hmthf0tqws9xpmd87ok7diqly webservice Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-20 13:51:38 +01:00
Paweł Gronowski	f9ced58158	Merge pull request #5845 from vvoland/vendor-docker ... vendor: github.com/docker/docker v28.0.0-dev (af898abe4466) v28.0.0	2025-02-19 22:05:47 +00:00
Paweł Gronowski	33f327a98f	vendor: github.com/docker/docker v28.0.0-dev (af898abe4466) ... full diff: https://github.com/docker/docker/compare/v28.0.0-rc.3...af898abe4466 Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2025-02-19 22:55:43 +01:00
Jonathan A. Sternberg	8890a1c929	cli-plugins: remove docker.cli specific otel attributes after usage ... Remove the `docker.cli` prefixed attributes from `OTEL_RESOURCE_ATTRIBUTES` after the telemetry provider has been created within a plugin. This prevents accidentally sending the attributes to something downstream for the user. This also fixes an issue with compose where the self-injected `OTEL_RESOURCE_ATTRIBUTES` would override an existing attribute in the environment file because the "user environment" overrode the environment file, but the "user environment" was created by the `docker` tool rather than by the user's environment. When `OTEL_RESOURCE_ATTRIBUTES` is empty after pruning, the environment variable is unset. Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>	2025-02-19 10:19:00 -06:00
Sebastiaan van Stijn	9e60cfe42e	Merge pull request #5843 from thaJeztah/bump_engine_28.0_rc3 ... vendor: github.com/docker/docker v28.0.0-rc.3	2025-02-19 17:08:38 +01:00
Sebastiaan van Stijn	96eb1e97da	Merge pull request #5841 from sarahsanders-docker/reference-styling-issue ... reference docs: fix missing link from heading	2025-02-19 17:08:08 +01:00
Sarah Sanders	f977b923cd	Fix missing link from Configure node healthcheck heading ... Update name to dispatcher-heartbeat Signed-off-by: Sarah Sanders <sarah.sanders@docker.com> Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-19 16:56:28 +01:00
Sebastiaan van Stijn	f53cee5dd1	vendor: github.com/docker/docker v28.0.0-rc.3 ... no diff; same commit, but tagged: https://github.com/docker/docker/compare/00ab386b5a2e...v28.0.0-rc.3 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-02-19 13:48:22 +01:00
Paweł Gronowski	1dcfd230bf	Merge pull request #5840 from thaJeztah/bump_engine_28.0_rc3 ... vendor: github.com/docker/docker 62bc5979908f (master, v28.0.0-rc.3) v28.0.0-rc.3	2025-02-18 22:17:28 +00:00