10248 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Sebastiaan van Stijn	261d2241eb	docs, man: remove confusing example for "--isolation" ... This snippet was added in [docker@38ec5d8][1]. The intent was to indicate that an empty value is equivalent to passing "default" as value. However, passing the `--isolation` flag _without a value_ (i.e., no `=` specified) will fail in many cases, as any string after it will be parsed as value (e.g. `docker run --isolation busybox` would consider `busybox` as value). This patch removes these lines as they add more confusion than addressing. [1]: https://github.com/docker/docker/commit/38ec5d86a355674cfddf8c998591abb098475bab Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 7b7a4c020e) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-01-03 18:41:59 +01:00
Sebastiaan van Stijn	e0e9feaa16	Merge pull request #5720 from thaJeztah/27.x_backport_fix-container-cp-test ... [27.x backport] test-fixes	2025-01-03 14:48:34 +01:00
Derek McGowan	074820d7bb	Fix cp test to separate source and destination ... Currently the cp will tar from the same directory it will untar into simultaneously. There is a race between reading the file and truncating the file for write, however, the race will not show up with a large enough buffer on the tar side if buffered before the copy begins. Also removes the unnecessary deferred removal, the removal is handled by cleanup and respects the no cleanup env. Signed-off-by: Derek McGowan <derek@mcg.dev> (cherry picked from commit 8c0cb30515) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-01-03 13:56:14 +01:00
Sebastiaan van Stijn	8b340f4e5c	TestRunCopyFromContainerToFilesystem: use Tar without options ... Just a minor cleanup; use archive.Tar as we're not using other options here. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit a8f83d5d99) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2025-01-03 13:56:09 +01:00
Sebastiaan van Stijn	21cdefcec6	Merge pull request #5712 from thaJeztah/27.x_update_engine ... [27.x] vendor: github.com/docker/docker v27.5.0-rc.1	2024-12-23 15:39:06 +01:00
Sebastiaan van Stijn	0e053a5cee	vendor: github.com/docker/docker v27.5.0-rc.1 ... no diff, only using tag instead of commit diff: https://github.com/docker/docker/compare/c23af2910987...v27.5.0-rc.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-23 15:30:03 +01:00
Sebastiaan van Stijn	7595cea3e5	Merge pull request #5706 from thaJeztah/27.x_bump_engine_27.5 ... [27.x] vendor: github.com/docker/docker c23af2910987 (27.x / v27.5.0-dev) v27.5.0-rc.1	2024-12-20 19:54:59 +01:00
Sebastiaan van Stijn	f009ed2b34	vendor: github.com/docker/docker c23af2910987 (27.x / v27.5.0-dev) ... full diff: https://github.com/docker/docker/compare/v27.4.1...c23af2910987f9f3528f60140a5b3d7fedcabbe0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-20 19:35:56 +01:00
Sebastiaan van Stijn	2dcdf75ad0	Merge pull request #5707 from thaJeztah/27.x_engine_deps ... [27.x backport] update dependencies for docker 27.5.0	2024-12-20 19:35:22 +01:00
Sebastiaan van Stijn	fd818019f5	vendor: go.opentelemetry.io/contrib/instrumentation/xxx v0.53.0 ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 10c5a57927) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-20 18:46:42 +01:00
Sebastiaan van Stijn	f264af6124	vendor: go.opentelemetry.io/otel v1.28.0 ... aligning all related packages to v1.28.0 as well Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 5e40d288c7) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-20 18:43:46 +01:00
Sebastiaan van Stijn	3e51dace7c	[27.x] vendor: google.golang.org/genproto f6361c86f094 ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-20 18:42:15 +01:00
Sebastiaan van Stijn	2d3e97f32d	vendor: github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 ... full diff: https://github.com/grpc-ecosystem/grpc-gateway/compare/v2.16.0...v2.20.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 9ba73a1a05) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-20 18:29:09 +01:00
Sebastiaan van Stijn	d8f2d1b155	vendor: update prometheus dependencies ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 074d1028b5) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-20 18:25:39 +01:00
Sebastiaan van Stijn	e3d2562114	vendor: github.com/go-logr/logr v1.4.2 ... full diff: https://github.com/go-logr/logr/compare/v1.4.1...v1.4.2 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 97ff1b7c0a) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-20 18:22:48 +01:00
Sebastiaan van Stijn	bcec6cb71a	vendor: github.com/cenkalti/backoff/v4 v4.3.0 ... full diff: https://github.com/cenkalti/backoff/compare/v4.2.1...v4.3.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 4c85feb4dd) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-20 18:22:26 +01:00
Sebastiaan van Stijn	ef6bc69c04	vendor: github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161 ... documentation changes only, no changes in vendored code full diff: https://github.com/Azure/go-ansiterm/compare/d185dfc1b5a1...306776ec8161 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 3b48a57b04) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-20 18:21:44 +01:00
Paweł Gronowski	68a89eaa17	Merge pull request #5701 from thaJeztah/27.x_update_docker ... [27.x] vendor: github.com/docker/docker v27.4.1	2024-12-18 12:23:53 +00:00
Sebastiaan van Stijn	d4dc4efef0	vendor: github.com/docker/docker v27.4.1 ... full diff: https://github.com/docker/docker/compare/v27.4.0...v27.4.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-18 13:14:35 +01:00
Albin Kerouanton	b9d17eaebb	Merge pull request #5700 from thaJeztah/27.x_backport_remove_use_of_netfilter_fields ... [27.x backport] cli/command/system: remove BridgeNfIptables, BridgeNfIp6tables in tests v27.4.1	2024-12-16 22:43:43 +01:00
Sebastiaan van Stijn	a08a120bae	cli/command/system: remove BridgeNfIptables, BridgeNfIp6tables in tests ... This is a follow-up to 55e404e7a8, which removed some warnings related to these fields. These fields in the /info response were used to warn users if netfiltering was not enabled on the host when the daemon started. Starting with [moby@db25b0d], detecting whether netfiltering is enabled now [happens when needed][1], making the state that's detected at startup irrelevant. These fields will therefore be deprecated in future, but we can start removing their use in tests. [moby@db25b0d]: https://github.com/moby/moby/commit/db25b0dcd0461802289e962aa0df3abd323d1994 [1]: https://github.com/moby/moby/blob/944e40350259f040950d871d402d848ff2a799bc/libnetwork/drivers/bridge/setup_bridgenetfiltering.go#L16-L77 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ffe0354c2c) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-16 22:19:20 +01:00
Sebastiaan van Stijn	4870b3d067	Merge pull request #5699 from thaJeztah/27.x_backport_remove_system_isabs ... [27.x backport] cli/command/container: use local copy of pkg/system.IsAbs	2024-12-16 18:37:44 +01:00
Sebastiaan van Stijn	d3b59fbd93	cli/command/container: use local copy of pkg/system.IsAbs ... Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 1eda498786) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-16 17:54:05 +01:00
Sebastiaan van Stijn	ac40240c02	Merge pull request #5685 from thaJeztah/27.x_backport_bump_xx ... [27.x backport] update xx to v1.6.1 for compatibility with alpine 3.21	2024-12-13 14:38:52 +01:00
Sebastiaan van Stijn	3fa9480d26	Merge pull request #5690 from thaJeztah/27.x_backport_bump_gomd2man ... [27.x backport] update go-md2man to v2.0.5	2024-12-13 13:13:22 +01:00
Sebastiaan van Stijn	fce7c04971	Merge pull request #5692 from thaJeztah/27.x_backport_remove_netfilter_warnings ... [27.x backport] cli/command/system: remove netfilter warnings from tests	2024-12-13 13:12:33 +01:00
Sebastiaan van Stijn	70815c1aa9	cli/command/system: remove netfilter warnings from tests ... These warnings will no longer be returned by the daemon, so remove them from the tests as well to make them more representative of reality. Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 55e404e7a8) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-13 10:32:25 +01:00
Sebastiaan van Stijn	12d98b057f	update go-md2man to v2.0.5 ... full diff: https://github.com/cpuguy83/go-md2man/compare/v2.0.4...v2.0.5 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit eaa8b5716d) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-13 01:24:27 +01:00
Sebastiaan van Stijn	f9783ec5c6	update xx to v1.6.1 for compatibility with alpine 3.21 ... This fixes compatibility with alpine 3.21 - Fix additional possible `xx-cc`/`xx-cargo` compatibility issue with Alpine 3.21 - Support for Alpine 3.21 - Fix `xx-verify` with `file` 5.46+ - Fix possible error taking lock in `xx-apk` in latest Alpine without `coreutils` full diff: https://github.com/tonistiigi/xx/compare/v1.5.0...v1.6.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 1e51ae7af2) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-13 00:58:52 +01:00
Paweł Gronowski	27cf4d7d85	Merge pull request #5681 from thaJeztah/27.x_update_docker ... [27.x] vendor: github.com/docker/docker v27.4.0	2024-12-09 16:20:00 +00:00
Sebastiaan van Stijn	6377f54f27	vendor: github.com/docker/docker v27.4.0 ... no diff, as it's the same commit full diff: https://github.com/docker/docker/compare/v27.4.0-rc.4...v27.4.0 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-09 17:02:04 +01:00
Sebastiaan van Stijn	0a1f8e414b	Merge pull request #5670 from thaJeztah/27.x_vendor_docker_27.4.0-rc.4 ... [27.x] vendor: github.com/docker/docker v27.4.0-rc.4	2024-12-05 10:37:00 +01:00
Sebastiaan van Stijn	dc8511cd60	vendor: github.com/docker/docker v27.4.0-rc.4 ... https://github.com/docker/docker/compare/v27.4.0-rc.3...v27.4.0-rc.4 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-05 09:35:02 +01:00
Sebastiaan van Stijn	bde2b89313	Merge pull request #5669 from thaJeztah/27.x_update_go_1.22.10 ... [27.x] update to go1.22.10 v27.4.0 v27.4.0-rc.4	2024-12-04 13:15:36 +01:00
Sebastiaan van Stijn	3284a80b05	update to go1.22.10 ... go1.22.10 (released 2024-12-03) includes fixes to the runtime and the syscall package. See the Go 1.22.10 milestone on our issue tracker for details. - https://github.com/golang/go/issues?q=milestone%3AGo1.22.10+label%3ACherryPickApproved - full diff: https://github.com/golang/go/compare/go1.22.9...go1.22.10 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-12-04 10:36:25 +01:00
Sebastiaan van Stijn	b7064a2758	Merge pull request #5661 from thaJeztah/27.x_backport_remove_repoinfo_class ... [27.x backport] cli/trust: GetNotaryRepository: remove uses of RepositoryInfo.Class	2024-12-02 16:15:46 +01:00
Sebastiaan van Stijn	67b6fe0b55	Merge pull request #5649 from thaJeztah/27.x_update_engine ... [27.x] vendor: github.com/docker/docker v27.4.0-rc.3	2024-12-02 09:22:21 +01:00
Sebastiaan van Stijn	5a0508ccc8	cli/trust: GetNotaryRepository: remove uses of RepositoryInfo.Class ... The Class field was added because Docker Hub registry required a special scope to be set for pulling plugins; HTTP/1.1 401 Unauthorized ... Www-Authenticate: Bearer realm="https://auth.docker.io/token",service="registry.docker.io",scope="repository(plugin):vieux/sshfs:pull",error="insufficient_scope" This is no longer a requirement, and the field is no longer set. updates 0ba820ed0b Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit ed9fcf31e6) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-30 14:47:06 +01:00
Sebastiaan van Stijn	9348385006	vendor: github.com/docker/docker v27.4.0-rc.3 ... no changes in vendored code full diff: https://github.com/docker/docker/compare/v27.4.0-rc.2...v27.4.0-rc.3 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-29 23:23:05 +01:00
Sebastiaan van Stijn	9ea09fd364	Merge pull request #5652 from vvoland/5651-27.x ... [27.x backport] cli-plugins: Fix searching inaccessible directories v27.4.0-rc.3	2024-11-29 15:54:54 +01:00
Sebastiaan van Stijn	0c9e0b43ce	Merge pull request #5658 from thaJeztah/27.x_backport_docs-fix-screwy-dockerd-rendering ... [27.x backport] docs: fix janky rendering of toc on docs.docker.com	2024-11-29 15:54:17 +01:00
David Karlsson	f4fec76472	docs: fix janky rendering of toc on docs.docker.com ... Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com> (cherry picked from commit 0f058041c4) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-29 14:50:48 +01:00
Sebastiaan van Stijn	6fd48251ce	Merge pull request #5654 from Benehiko/fix-run-ctx-27.x ... [27.x backport] fix: ctx on run image pull	2024-11-29 14:47:53 +01:00
Alano Terblanche	530cf098de	test: run does not have error status on 27.x branch ... Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>	2024-11-29 14:27:35 +01:00
Alano Terblanche	26da5bf025	fix: ctx should cancel image pull on run ... This patch fixes the context cancellation behaviour for the `runContainer` function, specifically the `createContainer` function introduced in this commit https://github.com/docker/cli/commit/991b1303daec833d662ec54002d1b34c8805afab. It delays stripping the `cancel` from the context passed into the `runContainer` function so that the `createContainer` function can be cancelled gracefully by a SIGTERM/SIGINT. This is especially true when the requested image does not exist and `docker run` needs to `pull` the image before creating the container. Although this patch does gracefully cancel the `runContainer` function it does not address the root cause. Some functions in the call path are not context aware, such as `pullImage`. Future work would still be necessary to ensure a consistent behaviour in the CLI. Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com> (cherry picked from commit 30a73ff19c) Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>	2024-11-29 14:27:24 +01:00
Paweł Gronowski	790d09e8dc	cli-plugins: Simplify addPluginCandidatesFromDir ... The returned error is always nil now, so just remove it. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit fcd94feefb) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2024-11-28 14:34:24 +01:00
Paweł Gronowski	5476e9e1dc	cli-plugins: Fix searching inaccessible directories ... Fix a case where one inaccessible plugin search path stops the whole search and prevents latter paths from being scanned. Remove a preliminary `Stat` call that verifies whether path is an actual directory and is accessible. It's unneeded and doesn't actually check whether the directory can be listed or not. `os.ReadDir` will fail in such case anyway, so just attempt to do that and ignore any encountered error, instead of erroring out the whole plugin candidate listing. Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com> (cherry picked from commit 6de3d71ab6) Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>	2024-11-28 14:34:22 +01:00
Sebastiaan van Stijn	ce03e25b14	Merge pull request #5640 from austinvazquez/cherry-pick-07e5ddd05441340dd044c14019dca22fe024a111-to-27.x ... [27.x backport] update golangci-lint to v1.62.0	2024-11-22 18:25:07 +01:00
Sebastiaan van Stijn	47a4f70d8a	update golangci-lint to v1.62.0 ... full diff: https://github.com/golangci/golangci-lint/compare/v1.61.0...v1.62.0 Changelog: https://golangci-lint.run/product/changelog/#v1620 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 07e5ddd054) Signed-off-by: Austin Vazquez <macedonv@amazon.com>	2024-11-22 01:11:55 +00:00
Paweł Gronowski	fa845f4a3c	Merge pull request #5623 from thaJeztah/27.x_bump_moby_27.4.0-rc.2-dev ... [27.x] vendor: github.com/docker/docker v27.4.0-rc.2	2024-11-20 11:57:02 +01:00