Commit Graph

54845 Commits

Author SHA1 Message Date
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
Sebastiaan van Stijn
d11232bad9 client: add newCancelReadCloser utility
Small utility to automatically close an io.ReadCloser when the
context is cancelled, but allowing the caller to close manually
as well.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-05 23:17:14 +01:00
Austin Vazquez
5e985ccd90 Merge pull request #51406 from austinvazquez/move-disk-system-usage-types
api/types: move disk usage structs to per type packages
2025-11-05 14:36:03 -06:00
Austin Vazquez
d55d2f738b Merge pull request #51383 from thaJeztah/client_ImageLoad_interface
client: use interface for return types
2025-11-05 11:35:59 -06:00
Austin Vazquez
b90e059dd9 Merge pull request #51386 from thaJeztah/adjust_build_tags
daemon/internal: adjust some build-tags
2025-11-05 11:34:12 -06:00
Austin Vazquez
cc25d0ebd4 Merge pull request #51403 from thaJeztah/singularize_prune
client: singularize prune methods
2025-11-05 11:33:14 -06:00
Austin Vazquez
fabdccbe10 api/types: move disk usage structs to per type packages
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-11-05 11:20:15 -06:00
Sebastiaan van Stijn
689776a4fa Merge pull request #51400 from thaJeztah/client_renames
client: ExecCreate: rename Tty to TTY, change ConsoleSize to a ConsoleSize type
2025-11-05 17:32:53 +01:00
Sebastiaan van Stijn
cdede16ce7 Merge pull request #51399 from thaJeztah/swarm_enums
api/types/swarm: create types for enum-consts
2025-11-05 16:33:20 +01:00
Sebastiaan van Stijn
de9ab07188 client: ExecCreateOptions: change ConsoleSize to a ConsoleSize type
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-05 15:53:28 +01:00
Sebastiaan van Stijn
443b548efa client: ExecCreate: rename Tty to TTY
Align with ExecStartOptions

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-05 15:53:03 +01:00
Sebastiaan van Stijn
ebc1dfbb64 client: singularize prune methods
All methods are singular; while pruning will impact multiple items,
it's more consistent to use singular for all operations.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-05 15:48:02 +01:00
Paweł Gronowski
7e92e1293d Merge pull request #51401 from vvoland/binimage-tags
gha/bin-image: Fix dco running on non-v tags
2025-11-05 15:37:15 +01:00
Paweł Gronowski
52a917d48a gha/bin-image: Fix dco running on non-v tags
bin-image workflow was failing for the new docker tags
(`docker-v29.0.0-rc.2`) because it wasn't correctly picked up by the
condition that should filter out tags.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-11-05 15:00:54 +01:00
Paweł Gronowski
49f96eecda Merge pull request #51392 from thaJeztah/bump_platforms
vendor: github.com/containerd/platforms v1.0.0-rc.2
2025-11-05 14:53:36 +01:00
Paweł Gronowski
97524fa4d4 Merge pull request #51397 from vvoland/vendor-buildkit
vendor: github.com/moby/buildkit v0.25.2
2025-11-05 14:13:55 +01:00
Paweł Gronowski
25f880c923 Merge pull request #51365 from SamStudio8/51364-dockersave
docker/save: stable timestamp for blobs/digest dir
2025-11-05 14:04:40 +01:00
Sebastiaan van Stijn
b075a393b1 Merge pull request #51235 from austinvazquez/refactor-client-system
api/types/system: deprecate `DiskUsage.*` fields and add type specific fields
2025-11-05 14:02:50 +01:00
Sebastiaan van Stijn
39ccd04ca8 api/types/swarm: define type for RegistryAuthSource
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-05 13:48:38 +01:00
Paweł Gronowski
39f2dbffa1 vendor: github.com/moby/buildkit v0.25.2
full diff: https://github.com/moby/buildkit/compare/v0.25.1...v0.25.2

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-11-05 13:09:29 +01:00
Sebastiaan van Stijn
d299e5be83 api/types/swarm: define type for UpdateOrder
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-05 12:50:51 +01:00
Sebastiaan van Stijn
b552b8b729 api/types/swarm: define type for FailureAction
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-05 12:50:48 +01:00
Paweł Gronowski
c1cfb483a1 Merge pull request #51393 from vvoland/update-runc
Dockerfile: update runc binary to v1.3.3
2025-11-05 12:40:41 +01:00
Paweł Gronowski
47edd80d97 integration-cli: Adjust nofile limits
runc v1.3.3 needs more file descriptors now.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-11-05 11:28:35 +01:00
Paweł Gronowski
35f6a78082 Dockerfile: update runc binary to v1.3.3
Update the version used in CI and for the static binaries.

- release notes: https://github.com/opencontainers/runc/releases/tag/v1.3.3
- full diff: https://github.com/opencontainers/runc/compare/v1.3.2...v1.3.3

This release contains fixes for three high-severity security
vulnerabilities in runc (CVE-2025-31133, CVE-2025-52565, and
CVE-2025-52881). All three vulnerabilities ultimately allow (through
different methods) for full container breakouts by bypassing runc's
restrictions for writing to arbitrary /proc files.

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2025-11-05 10:57:28 +01:00
Sebastiaan van Stijn
5ad71c5ddf vendor: github.com/containerd/platforms v1.0.0-rc.2
- Add WS2025 to Windows matcher and code optimizations
- use windowsMatchComparer for OSVersion match order
  Windows OS version should match based on the full OSVersion. When
  sorting a manifest, the entries should be sorted using the `Less`
  function.

full diff: https://github.com/containerd/platforms/compare/v1.0.0-rc.1...v1.0.0-rc.2

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-05 07:45:03 +01:00
Sebastiaan van Stijn
353dc7d904 Merge pull request #51384 from robmry/fix-test-TestHandleMACAddressBC
Fix TestHandleMACAddressBC
2025-11-04 12:31:16 +01:00
Sebastiaan van Stijn
3a105f4e0c daemon/internal: adjust some build-tags
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-04 10:52:52 +01:00
Austin Vazquez
a69abdd90d api/types/system: add type specific usage fields to DiskUsage
This change adds type specific fields to `GET /system/df` endpoint with high level information of disk usage. This change also introduces `verbose` query to the endpoint so that detailed information is by default excluded unless queried to reduce memory consumption. The previous top level `DiskUsage` fields (`Images`, `Containers`, `Volumes` and `BuildCache`) are now deprecated and kept for backwards compatibility.

Co-authored-by: Claude <noreply@anthropic.com>
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com>
2025-11-03 16:34:26 -06:00
Rob Murray
2af22d3512 Fix TestHandleMACAddressBC
- expCtrWideMAC was unused
- missing test for API 1.52

Signed-off-by: Rob Murray <rob.murray@docker.com>
2025-11-03 18:33:13 +00:00
Sebastiaan van Stijn
dc22f2c8bf client: make ImageSaveResult an interface
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-03 18:39:52 +01:00
Sebastiaan van Stijn
5c8a9b7b9e client: make TaskLogsResult an interface
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-03 18:27:29 +01:00
Sebastiaan van Stijn
7dc9d39ca1 client: make ContainerLogsResult an interface
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-03 18:21:07 +01:00
Sebastiaan van Stijn
8d0b09c722 client: make ServiceLogsResult an interface
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-03 18:08:54 +01:00
Sebastiaan van Stijn
0257c642c7 client: make ContainerExportResult an interface
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-03 18:01:42 +01:00
Sebastiaan van Stijn
5bfc628e97 client: make ImageImportResult an interface
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-03 18:01:42 +01:00
Sebastiaan van Stijn
5fc866fbfd client: make ImageLoadResult an interface
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-03 16:28:35 +01:00
Sebastiaan van Stijn
1051c7f89e client: Client.ImageLoad: move description of platform parameter
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-03 16:28:35 +01:00
Sebastiaan van Stijn
bb27db85fb Merge pull request #51382 from thaJeztah/add_replace
go.mod: add back replace rules
2025-11-03 16:28:27 +01:00
Sebastiaan van Stijn
b30eb86b31 go.mod: add back replace rules
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2025-11-03 16:08:47 +01:00
Rob Murray
0b8fa46230 Merge pull request #51369 from dohrisalim/issue#50159
integration-cli: migrate TestAPIStatsContainerNotFound to integration tests
2025-11-03 14:46:21 +00:00
Sam Nicholls
668b546d2c docker/save: stable timestamp for blobs/digest dir
Writing the OCI manifest file to the blobs/digest dir will update the
directory mtime, producing a tar file containing a member with a
contemporary mtime. Exported tars for the same image will therefore have
different checksums.

Although this was previously addressed by overriding the mtime manually
to 0, this was done before the OCI manifest file was written. This
change simply moves the call to system.Chtimes to set the mtime of the
blobs/digest directory to 0 after writing the OCI manifest file.

This commit also updates the TestSaveCheckTimes integration test to
check the mtime of all members in the exported tar to ensure that all
mtime are not newer than img.Created or 0 (depending on whether the
containerd-snapshotter is disabled or enabled, respectively).

Signed-off-by: Sam Nicholls <sam.nicholls@nanoporetech.com>
2025-11-03 13:15:19 +00:00
Albin Kerouanton
ada61040e0 Merge pull request #51379 from AkihiroSuda/validate-rootlesskit-net
dockerd-rootless.sh: reject DOCKERD_ROOTLESS_ROOTLESSKIT_NET=host
2025-11-02 16:57:45 +01:00
Albin Kerouanton
7aa44d98cb Merge pull request #51380 from AkihiroSuda/fix-dockerd-rootless.sh
dockerd-rootless.sh: restore missing `exit 1`
2025-11-02 16:56:07 +01:00
Salim Dohri
9b749d7c85 integration-cli: migrate TestAPIStatsContainerNotFound to integration tests
Migrate TestAPIStatsContainerNotFound from the deprecated integration-cli
test suite to the modern integration test framework in integration/container.

The test verifies that the container stats API returns a NotFound error
for non-existent containers, testing both streaming and non-streaming modes.

Changes made:
- Migrated test to integration/container/stats_test.go using standard
  Go testing patterns
- Refactored to use test array pattern for better test organization
- Removed test from integration-cli/docker_api_stats_test.go
- Removed unused imports from integration-cli file
- Removed Windows skip as it may not be necessary

Signed-off-by: Salim Dohri <dohri.salim@gmail.com>
2025-11-02 10:46:22 +01:00
Akihiro Suda
b6dab24a43 dockerd-rootless.sh: restore missing exit 1
Fix a regression in 7e63d2a (PR 51149)

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2025-11-02 16:56:00 +09:00
Akihiro Suda
76b1d304e4 dockerd-rootless.sh: reject DOCKERD_ROOTLESS_ROOTLESSKIT_NET=host
`rootlesskit --net=host` does not work with Docker.

Alternative ways to run Rootless Docker without the network overhead:
- Use https://github.com/rootless-containers/bypass4netns
- Or, use `docker run --net=host` with a PR 47103 (WIP)

See issue 51363

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
2025-11-02 16:43:43 +09:00
Sebastiaan van Stijn
5ac561ff8c Merge pull request #51373 from thaJeztah/no_exclude
go.mod: remove "exclude" rules
2025-10-31 19:32:08 +01:00