10229 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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]: db25b0dcd0 [1]: 944e403502/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 991b1303da. 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
Sebastiaan van Stijn	6b9fb59d31	[27.x] vendor: github.com/docker/docker v27.4.0-rc.2 ... no changes in vendored code full diff: https://github.com/docker/docker/compare/v27.4.0-rc.1...v27.4.0-rc.2 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-19 20:38:39 +01:00
Laura Brehm	af56ef5b07	Merge pull request #5635 from thaJeztah/27.x_backport_improve_noflickr v27.4.0-rc.2	2024-11-19 13:58:27 +01:00
Giedrius Jonikas	39d73afbdd	Optimise docker stats to not require clearing the whole screen ... Instead of clearing the whole screen and then writing the new stats, we now write the new stats on top of the old text, and then clear the remaining text. This is a more efficient way to update the stats, as it avoids the flickering that happens when the screen is cleared and rewritten. Signed-off-by: Giedrius Jonikas <giedriusj1@gmail.com> (cherry picked from commit cb2f95ceee) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-19 12:49:28 +01:00
Sebastiaan van Stijn	c6537362af	Merge pull request #5631 from thaJeztah/27.x_bump_grpc ... [27.x] vendor: google.golang.org/grpc v1.66.3	2024-11-19 09:55:33 +01:00
Sebastiaan van Stijn	877668c92a	[27.x] vendor: google.golang.org/grpc v1.66.3 ... - transport: Fix reporting of bytes read while reading headers - xds/server: Fix xDS Server leak full diff: https://github.com/grpc/grpc-go/compare/v1.66.2...v1.66.3 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-19 00:42:16 +01:00
Sebastiaan van Stijn	8d1bacae3e	Merge pull request #5622 from thaJeztah/27.x_backport_update_buildtags ... [27.x backport] update go:build tags to use go1.22, fix missing go:build tag	2024-11-15 11:25:12 +01:00
Sebastiaan van Stijn	cfe6090d5d	cli/command/container: fix missing go:build tag ... make shell make -C ./internal/gocompat/ GO111MODULE=on go test -v # github.com/docker/cli/cli/command/container ../../cli/command/container/completion.go:37:28: implicit function instantiation requires go1.18 or later (-lang was set to go1.16; check go.mod) ../../cli/command/container/completion.go:82:25: implicit function instantiation requires go1.18 or later (-lang was set to go1.16; check go.mod) ../../cli/command/container/completion.go:92:27: implicit function instantiation requires go1.18 or later (-lang was set to go1.16; check go.mod) FAIL gocompat [build failed] Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit d1d5353269) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-15 11:10:46 +01:00
Sebastiaan van Stijn	3df40364f6	update go:build tags to use go1.22 ... commit 4a7b04d412 configured golangci-lint to use go1.23 semantics, which enabled the copyloopvar linter. go1.22 now creates a copy of variables when assigned in a loop; make sure we don't have files that may downgrade semantics to go1.21 in case that also means disabling that feature; https://go.dev/ref/spec#Go_1.22 Signed-off-by: Sebastiaan van Stijn <github@gone.nl> (cherry picked from commit 7c80e4f938) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-15 11:10:35 +01:00
Paweł Gronowski	c5d93f53a7	Merge pull request #5619 from thaJeztah/27.x_bump_moby_27.4.0-rc.1 ... [27.x] vendor: github.com/docker/docker v27.4.0-rc.1	2024-11-15 09:25:00 +00:00
Sebastiaan van Stijn	a4dc3d78e5	vendor: github.com/docker/docker v27.4.0-rc.1 ... no diff, as it's the same commit, but tagged: https://github.com/docker/docker/compare/5765e9f35b00...v27.4.0-rc.1 Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-14 23:14:39 +01:00
Sebastiaan van Stijn	75876b4e20	Merge pull request #5618 from thaJeztah/27.x_backport_container_completions ... [27.x backport] Improve Cobra completions for run and create v27.4.0-rc.1	2024-11-14 18:25:35 +01:00
Sebastiaan van Stijn	69bc2b1f0c	Merge pull request #5545 from thaJeztah/27.x_vendor_moby ... [27.x] vendor: github.com/docker/docker 5765e9f35b00 (v27.4-dev)	2024-11-14 18:25:03 +01:00
Harald Albers	955e003345	Handle null completions with a default callback ... Credits to thaJeztah Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 06260e68f3) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-14 17:04:55 +01:00
Harald Albers	ce77f4a545	Add completion for --volume-driver ... Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 4525fe37b4) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-14 17:04:54 +01:00
Harald Albers	e20bcf3565	Add completion for --cgroupns ... Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit db0ed1e216) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-14 17:04:54 +01:00
Harald Albers	78544cd587	Add completion for --uts ... Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 2915749279) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-14 17:04:54 +01:00
Harald Albers	d11291966d	Add completion for --log-driver and --log-opt ... Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 3a2503fa43) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-14 17:04:54 +01:00
Harald Albers	25ff89519f	Add completion for --security-opt ... Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 9a9ae231a9) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-14 17:04:54 +01:00
Harald Albers	83303411ee	Add completion for --detach-keys ... Signed-off-by: Harald Albers <github@albersweb.de> (cherry picked from commit 5f7c43e5e6) Signed-off-by: Sebastiaan van Stijn <github@gone.nl>	2024-11-14 17:04:53 +01:00