Commit Graph

54896 Commits

Author SHA1 Message Date
Paweł Gronowski
cb8228b147 Merge pull request #51433 from vvoland/vendor-client
vendor: github.com/moby/moby/client v0.1.0-rc.1
docker-v29.0.0-rc.3 v2.0.0-beta.2
2025-11-07 01:32:37 +01:00
Paweł Gronowski
34b6fb783d vendor: github.com/moby/moby/client v0.1.0-rc.1
full diff: https://github.com/moby/moby/client/compare/v0.1.0-beta.3...v0.1.0-rc.1

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-11-07 01:23:30 +01:00
Paweł Gronowski
1b8ff20dee Merge pull request #51432 from vvoland/vendor-api
vendor: github.com/moby/moby/api v1.52.0-rc.1
client/v0.1.0-rc.1
2025-11-07 01:19:50 +01:00
Paweł Gronowski
f66f1b451c vendor: github.com/moby/moby/api v1.52.0-rc.1
full diff: https://github.com/moby/moby/api/compare/v1.52.0-beta.4...v1.52.0-rc.1

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-11-07 01:11:18 +01:00
Paweł Gronowski
35e8c8b929 Merge pull request #51430 from vvoland/drop-replace
Drop replace rules for v29.0.0-rc.3
api/v1.52.0-rc.1
2025-11-07 01:05:20 +01:00
Paweł Gronowski
e8745c2157 Drop replace rules
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-11-07 00:56:57 +01:00
Sebastiaan van Stijn
52e19b6e6d Merge pull request #51402 from thaJeztah/cleanup_interfaces
client: cleanup and re-group interfaces
2025-11-07 00:53:54 +01:00
Sebastiaan van Stijn
243e19e1f2 Merge pull request #51421 from thaJeztah/dockerd_cleanups
cmd/dockerd: minor cleanups / changes
2025-11-07 00:53:35 +01:00
Paweł Gronowski
16b865e7ce Merge pull request #51431 from thaJeztah/client_rm_deprecated
client: remove uses of deprecated NewClientWithOpts
2025-11-07 00:52:56 +01:00
Paweł Gronowski
7fd468cebf Merge pull request #51428 from austinvazquez/rename-api-fields
Rename disk usage API fields
2025-11-07 00:52:46 +01:00
Sebastiaan van Stijn
8db3118ac9 client: remove uses of deprecated NewClientWithOpts
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-07 00:07:11 +01:00
Sebastiaan van Stijn
1745075b24 client: DiskUsage: rename fields to match API
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 17:06:53 -06:00
Paweł Gronowski
56463970c0 Merge pull request #51429 from thaJeztah/unexport_streamformatter
client: pkg/streamformatter: un-export unused utilities
2025-11-07 00:05:33 +01:00
Sebastiaan van Stijn
dcfcfd33e9 client: cleanup and re-group interfaces
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 23:48:47 +01:00
Austin Vazquez
931c347b36 api/types: rename disk usage fields
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-11-06 16:21:32 -06:00
Paweł Gronowski
217fd78905 Merge pull request #51412 from austinvazquez/use-regular-slice-for-disk-usage
api/types: use regular slices for disk usage types
2025-11-06 23:13:47 +01:00
Sebastiaan van Stijn
745c483e42 client: pkg/streamformatter: un-export unused utilities
Un-export or remove utilities that have no (external) users;

- AuxFormatter (not used)
- FormatError (only used internally)
- FormatStatus (only used internally)
- NewJSONProgressOutput (used by CLI)
- NewProgressOutput (used by compose, cli for classic builder)
- NewStderrWriter (not used)
- NewStdoutWriter (not used)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 23:12:11 +01:00
Austin Vazquez
4c6d0ebc40 Fix disk usage result from legacy response logic
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-11-06 15:12:30 -06:00
Sebastiaan van Stijn
f7fd9c315a Merge pull request #51381 from thaJeztah/simplify_pkg_security
client/pkg/security: simplify
2025-11-06 22:06:08 +01:00
Paweł Gronowski
0b56248e63 Merge pull request #51427 from vvoland/update-selinux
vendor: github.com/opencontainers/selinux v1.13.0
2025-11-06 21:45:36 +01:00
Paweł Gronowski
ffc8580397 Merge pull request #51390 from vvoland/c8d-work
daemon: Refactor image store choice logic
2025-11-06 20:29:27 +01:00
Paweł Gronowski
bc3c37098c vendor: github.com/opencontainers/selinux v1.13.0
full diff: https://github.com/opencontainers/selinux/compare/v1.12.0...v1.13.0

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-11-06 20:26:55 +01:00
Paweł Gronowski
10f6eeb56d daemon: Refactor image store choice logic
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-11-06 20:09:27 +01:00
Paweł Gronowski
0ecfc58f6a Merge pull request #51418 from vvoland/update-go
update to go1.25.4
2025-11-06 17:50:30 +01:00
Sebastiaan van Stijn
4a3e139e3c daemon/command: NewDaemonRunner: set both stdout and stderr
Make sure Cobra is configured with the streams we use, and use
Cobra's utilities to print the validation messsage.

While updating, also add a short comment outlining why we're using
STDERR, not STDOUT for this message.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 15:53:11 +01:00
Sebastiaan van Stijn
0678de9c87 cmd/dockerd: main(): remove "onError" func
Remove the redundant abstraction; just inline it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 15:52:35 +01:00
Sebastiaan van Stijn
9e350b6832 Merge pull request #51339 from thaJeztah/bump_google_logs
vendor: cloud.google.com/go/compute/metadata v0.7.0, cloud.google.com/go/logging v1.12.0
2025-11-06 15:47:38 +01:00
Albin Kerouanton
a045cdd3cf Merge pull request #51419 from djs55/delete-readme
delete trivially redundant/incorrect cmd/dockerd/README.md
2025-11-06 15:34:02 +01:00
Paweł Gronowski
922cd97491 update to go1.25.4
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-11-06 14:15:23 +01:00
David Scott
d6ceff48bf delete redundant/incorrect cmd/dockerd/README.md
The README was useful when it was pointing to docker.go and when
docker.go contained the arg parsing and env setting code, but the
structure was simplified by @dmcgowan in 33139da522

It seems pointless to update it to say:

> main.go contains Docker daemon's main function.

and this part is out of date

> This file provides first line CLI argument parsing and environment variable setting.

It seems redundant with the new simpler structure, so delete it.

Signed-off-by: David Scott <dave@recoil.org>
2025-11-06 13:09:08 +00:00
Paweł Gronowski
12e5282c16 Merge pull request #51417 from vvoland/lima-revert-v2
gha/vm: Force Lima v1.2.2
2025-11-06 14:07:08 +01:00
Paweł Gronowski
d0fbae6e44 gha/vm: Force Lima v1.2.2
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-11-06 13:24:37 +01:00
Sebastiaan van Stijn
062906a354 Merge pull request #51414 from thaJeztah/remove_dummy_command
daemon/command: remove `__dummy_command` workaround for completion
2025-11-06 12:33:09 +01:00
Sebastiaan van Stijn
d661f17c3c Merge pull request #51306 from thaJeztah/client_readers
client: use cancelReadCloser for readers
2025-11-06 12:32:28 +01:00
Sebastiaan van Stijn
0029924181 api/types/system: change legacyDiskUsage to a non-pointer slice
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 12:31:05 +01:00
Sebastiaan van Stijn
ff019cd853 internal/sliceutil: add Deref utility
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 12:15:25 +01:00
Akihiro Suda
0035b5eed6 Merge pull request #51409 from austinvazquez/test-containerd-2.1.5
Dockerfile: test containerd v2.1.5 (linux), v2.0.7 (windows)
2025-11-06 18:01:10 +09:00
Sebastiaan van Stijn
e509a7cefe daemon/command: remove __dummy_command workaround for completion
This workaround was added in 3bb40af036 to
work around a limitation of Cobra, which didn't support completion if there
are no subcommands, because [Command.InitDefaultCompletionCmd] disabled
completion, as implicitly adding the hidden `completion` and `__complete`
subcommands would break binaries without subcommands that accepted positional
args.

This problem was fixed in Cobra v1.9.0 through [cobra@24ada7f], which now
dynamically adds the `completion` subcommand when invoked.

This patch removes the hidden `__dummy_command`, which was used to work around
the logic in Cobra < v1.9.0, and to make it enable completion regardless.

Completion should still work as usual:

    dockerd completion --help

    Usage:	dockerd completion [flags]
    ...

    source <(dockerd completion bash)
    dockerd --default-<tab>
    --default-address-pool   (Default address pools for node specific local networks)
    --default-cgroupns-mode  (Default mode for containers cgroup namespace ("host" | "private"))
    --default-gateway        (Default gateway IPv4 address for the default bridge network)
    --default-gateway-v6     (Default gateway IPv6 address for the default bridge network)
    --default-ipc-mode       (Default mode for containers ipc ("shareable" | "private"))
    --default-network-opt    (Default network options)
    --default-runtime        (Default OCI runtime for containers)
    --default-shm-size       (Default shm size for containers)
    --default-ulimit         (Default ulimits for containers)

[Command.InitDefaultCompletionCmd]: https://github.com/spf13/cobra/blob/v1.8.1/completions.go#L685-L698
[cobra@24ada7f]: 24ada7fe71

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 09:42:49 +01:00
Austin Vazquez
6881ae72c7 api/types: use regular slices for disk usage types
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-11-05 22:05:47 -06:00
Austin Vazquez
52217f1592 Merge pull request #51408 from austinvazquez/vendor-containerd-2.1.5
vendor: github.com/containerd/containerd v2.1.5
2025-11-05 20:11:49 -06:00
Austin Vazquez
c351539358 Dockerfile: test containerd v2.1.5 (linux), v2.0.7 (windows)
Update the version of containerd used in CI and for static binaries
to v2.1.5 (linux) and v2.0.7 (windows)

Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-11-05 19:11:57 -06:00
Austin Vazquez
37d75fc46c vendor: github.com/containerd/containerd v2.1.5
full diff: https://github.com/containerd/containerd/compare/v2.1.4...v2.1.5

Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-11-05 19:08:58 -06:00
Sebastiaan van Stijn
f76f1fc013 client: Client.ImageSave: close reader on context cancellation
Use a cancelReadCloser to automatically close the reader when the context
is cancelled. Consumers are still recommended to manually close the reader,
but the cancelReadCloser makes the Close idempotent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 00:10:59 +01:00
Sebastiaan van Stijn
175e4e5048 client: Client.TaskLogs: close reader on context cancellation
Use a cancelReadCloser to automatically close the reader when the context
is cancelled. Consumers are still recommended to manually close the reader,
but the cancelReadCloser makes the Close idempotent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 00:10:54 +01:00
Sebastiaan van Stijn
d35d8ec81b client: Client.ContainerLogs: close reader on context cancellation
Use a cancelReadCloser to automatically close the reader when the context
is cancelled. Consumers are still recommended to manually close the reader,
but the cancelReadCloser makes the Close idempotent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 00:09:33 +01:00
Sebastiaan van Stijn
cc9969bfed client: Client.ServiceLogs: close reader on context cancellation
Use a cancelReadCloser to automatically close the reader when the context
is cancelled. Consumers are still recommended to manually close the reader,
but the cancelReadCloser makes the Close idempotent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 00:08:23 +01:00
Sebastiaan van Stijn
c5aedacb4f client: Client.ContainerExport: close reader on context cancellation
Use a cancelReadCloser to automatically close the reader when the context
is cancelled. Consumers are still recommended to manually close the reader,
but the cancelReadCloser makes the Close idempotent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 00:07:57 +01:00
Sebastiaan van Stijn
08cd02cab6 client: Client.ImageImport: close reader on context cancellation
Use a cancelReadCloser to automatically close the reader when the context
is cancelled. Consumers are still recommended to manually close the reader,
but the cancelReadCloser makes the Close idempotent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 00:07:52 +01:00
Sebastiaan van Stijn
849239cedf client: Client.ImageLoad: close reader on context cancellation
Use a cancelReadCloser to automatically close the reader when the context
is cancelled. Consumers are still recommended to manually close the reader,
but the cancelReadCloser makes the Close idempotent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 00:07:14 +01:00
Sebastiaan van Stijn
be96014740 client: Client.ContainerStats: close reader on context cancellation
Use a cancelReadCloser to automatically close the reader when the context
is cancelled. Consumers are still recommended to manually close the reader,
but the cancelReadCloser makes the Close idempotent.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-06 00:06:16 +01:00