dad1d367c8
cli/command/container: move debug logs to call-site
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-28 12:08:54 +01:00
e50c94f21a
Merge pull request #6581 from thaJeztah/stats_ostype
...
cli/command/container: don't depend on result.OSType
2025-10-27 21:43:53 -05:00
93cd6793b3
Merge pull request #6580 from thaJeztah/no_json
...
cli/command/image: remove uses of JSON field
2025-10-27 21:42:29 -05:00
f594a7f09b
cli/command/image: remove uses of JSON field
...
The JSON field was added in [moby@9fd2c0f], to address [moby#19177], which
reported an incompatibility with Classic (V1) Swarm, which produced a non-
standard response;
> Make docker load to output json when the response content type is json
> Swarm hijacks the response from docker load and returns JSON rather
> than plain text like the Engine does. This makes the API library to return
> information to figure that out.
A later change in [moby@96d7db6] added additional logic to make sure the
correct content-type was returned, depending on whether the `quiet` option
was set (which produced a non-JSON response). This caused inconsistency in
the API response, and [moby@2f27632] changed the endpoint to always produce
JSON (only skipping the "progress" output if `quiet` was set).
This means that the "load" endpoint ([`imageRouter.postImagesLoad`]) now
unconditionally returns JSON, making the `JSON` field fully redundant.
This patch removes the use of the JSON field, as it's redundant, and the way it handles
the content-type is incorrect because it would not handle correct, but different
formatted response-headers (`application/json; charset=utf-8`), which could
result in malformed output on the client.
[moby@9fd2c0f]: https://github.com/moby/moby/commit/9fd2c0feb0c131d01d727d50baa7183b976c7bdc
[moby#19177]: https://github.com/moby/moby/issues/19177
[moby@96d7db6]: https://github.com/moby/moby/commit/96d7db665b06cc0bbede22d818c69dc5f6921f66
[moby@2f27632]: https://github.com/moby/moby/commit/2f27632cde2f0e514bd3a8de77cc1934e5193a83
[`imageRouter.postImagesLoad`]: https://github.com/moby/moby/blob/7b9d2ef6e5518a3d3f3cc418459f8df786cfbbd1/api/server/router/image/image_routes.go#L248-L255
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-27 21:37:36 +01:00
4b498addce
cli/command/container: don't depend on result.OSType
...
This field is set for the request as a whole, so can be obtained
from the server-info instead. Docker v29 will provide per-stats
information.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-27 21:35:25 +01:00
715467c9d8
Merge pull request #6569 from jsternberg/otel-sdk-lock-version
...
telemetry: lock the semconv version of the otel sdk
2025-10-27 21:17:09 +01:00
dafbfc2f7e
Merge pull request #6576 from robmry/bump_modules_again
...
vendor: github.com/moby/moby/api, moby/moby/client master
2025-10-27 20:35:49 +01:00
4a608069a7
vendor: github.com/moby/moby/api, moby/moby/client master
...
Signed-off-by: Rob Murray <rob.murray@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-27 20:26:27 +01:00
153f7f10c9
telemetry: lock the semconv version of the otel sdk
...
This change prevents changes to the otel version from affecting the otel
sdk version. This is done by copying the telemetry sdk implementation
locally and using our own choice for semconv from within that.
This prevents a schema conflict from happening since the otel version of
the sdk gets implicitly updated whenever the semconv changes while we
have to manually change ours. Now, we manually change both and they're
locked to each other.
Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-27 11:44:59 +01:00
965a0e3518
Merge pull request #6575 from thaJeztah/bump_modules
...
vendor: github.com/moby/moby/api, moby/moby/client master
2025-10-26 17:40:19 +01:00
4afbd6146b
implement some ad-hoc mocks for responses
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-25 01:36:38 +02:00
056e314645
vendor: github.com/moby/moby/api, moby/moby/client master
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-25 00:48:49 +02:00
f74cd147bb
Merge pull request #6571 from thaJeztah/bump_modules
...
vendor: github.com/moby/moby/api, moby/moby/client master
2025-10-24 16:43:53 +02:00
4f7c07cfc2
update local code for updated modules
...
Some tests had to be skipped as there's some issues to address, and
some of the result-types cannot be mocked / stubbed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-24 10:28:54 +02:00
aeb78091a0
vendor: github.com/moby/moby/api, moby/moby/client master
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-24 10:28:26 +02:00
7b4cde6967
Merge pull request #6567 from thaJeztah/bump_modules
...
vendor: github.com/moby/moby/api, moby/moby/client master
2025-10-20 16:52:25 +02:00
563f5fe335
vendor: github.com/moby/moby/api, moby/moby/client master
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-20 12:30:05 +02:00
171a9b70b2
Merge pull request #6564 from vvoland/container-go123
...
cli/command/container: add go1.23 build constraint for range-over-func
2025-10-14 15:00:57 +02:00
5ba4c17d78
cli/command/container: Simplify with slices.Contains
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2025-10-14 14:47:59 +02:00
d252afa6b0
cli/command/container: add go1.23 build constraint for range-over-func
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2025-10-14 14:43:54 +02:00
bc2aa4eed1
Merge pull request #6563 from thaJeztah/bump_modules
...
build / prepare (push) Has been cancelled
build / build (push) Has been cancelled
build / bin-image (push) Has been cancelled
build / prepare-plugins (push) Has been cancelled
build / plugins (push) Has been cancelled
codeql / codeql (push) Has been cancelled
e2e / tests (alpine, 25, connhelper-ssh) (push) Has been cancelled
e2e / tests (alpine, 25, local) (push) Has been cancelled
e2e / tests (alpine, 27, connhelper-ssh) (push) Has been cancelled
e2e / tests (alpine, 27, local) (push) Has been cancelled
e2e / tests (alpine, 28, connhelper-ssh) (push) Has been cancelled
e2e / tests (alpine, 28, local) (push) Has been cancelled
e2e / tests (debian, 25, connhelper-ssh) (push) Has been cancelled
e2e / tests (debian, 25, local) (push) Has been cancelled
e2e / tests (debian, 27, connhelper-ssh) (push) Has been cancelled
e2e / tests (debian, 27, local) (push) Has been cancelled
e2e / tests (debian, 28, connhelper-ssh) (push) Has been cancelled
e2e / tests (debian, 28, local) (push) Has been cancelled
test / ctn (push) Has been cancelled
test / host (macos-14) (push) Has been cancelled
test / host (macos-15) (push) Has been cancelled
test / host (macos-15-intel) (push) Has been cancelled
validate / validate (lint) (push) Has been cancelled
validate / validate (shellcheck) (push) Has been cancelled
validate / validate (update-authors) (push) Has been cancelled
validate / validate (validate-vendor) (push) Has been cancelled
validate / validate-md (push) Has been cancelled
validate / validate-make (manpages) (push) Has been cancelled
validate / validate-make (yamldocs) (push) Has been cancelled
vendor: github.com/moby/moby/api v1.52.0-beta.2, moby/client v0.1.0-beta.2
2025-10-14 11:35:31 +02:00
24e95b8682
vendor: github.com/moby/moby/api v1.52.0-beta.2, moby/client v0.1.0-beta.2
...
full diff:
- https://github.com/moby/moby/compare/0769fe708773...api/v1.52.0-beta.2
- https://github.com/moby/moby/compare/0769fe708773...client/v0.1.0-beta.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-14 10:43:33 +02:00
c844f92b58
Merge pull request #6562 from vvoland/update-go
...
update to go1.25.3
2025-10-14 10:28:33 +02:00
07a79d68a6
Merge pull request #6561 from thaJeztah/deprecate_builder_utils
...
cli/command/image/build: deprecate `DefaultDockerfileName`, `DetectArchiveReader`, `WriteTempDockerfile`, `ResolveAndValidateContextPath`
2025-10-14 10:27:52 +02:00
2bcf047f90
update to go1.25.3
...
This release addresses breakage caused by a security patch included in
Go 1.25.2 and 1.24.8, which enforced overly restrictive validation on
the parsing of X.509 certificates. We've removed those restrictions
while maintaining the security fix that the initial release addressed.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2025-10-14 09:11:31 +02:00
0f2f9e9c41
cli/command/image/build: deprecate ResolveAndValidateContextPath util
...
This utility was used internally and will be removed in the next release.
Use `DetectContextType` to detect the context-type, and use `GetContextFromLocalDir`,
`GetContextFromLocalDir`, `GetContextFromGitURL`, or `GetContextFromURL`
instead.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-13 15:42:03 +02:00
6e1ff0bec1
cli/command/image/build: deprecate WriteTempDockerfile util
...
It was only used internal in the package.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-13 15:29:08 +02:00
c52fa073cd
cli/command/image/build: deprecate DetectArchiveReader util
...
It was only used internal in the package.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-13 15:28:55 +02:00
f24bb4bc76
cli/command/image/build: deprecate DefaultDockerfileName const
...
It was only used internal in the package.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-13 15:20:32 +02:00
c599e9064e
Merge pull request #6556 from thaJeztah/update_go1.25
...
update to go1.25.2
2025-10-13 12:52:23 +02:00
68ec5bfe20
Merge pull request #6559 from thaJeztah/fix_filteropts_default
...
opts: FilterOpt: show empty string if no values are set
2025-10-13 12:31:45 +02:00
130a3f5f87
update to go1.25.2
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-13 12:12:25 +02:00
e6d150be16
opts: FilterOpt: show empty string if no values are set
...
follow-up to f81816ef88github@gone.nl >
2025-10-13 12:09:26 +02:00
ecea0c01b3
Merge pull request #6557 from thaJeztah/bump_golangci_lint
...
Dockerfile: update golangci-lint to v2.5.0 (for go1.25)
2025-10-13 12:02:34 +02:00
2027349052
Merge pull request #6555 from thaJeztah/remove_ResolveDefaultContext
...
cli/command: remove deprecated ResolveDefaultContext
2025-10-13 12:02:01 +02:00
bb31a8006e
Merge pull request #6554 from thaJeztah/bump_goversioninfo
...
Dockerfile: bump github.com/josephspurrier/goversioninfo to v1.5.0
2025-10-13 12:00:35 +02:00
8ecdfed2af
Merge pull request #6552 from thaJeztah/update_gotestsum
...
Dockerfile: bump gotest.tools/gotestsum v1.13.0
2025-10-13 12:00:02 +02:00
714c82a014
Merge pull request #6558 from thaJeztah/opts_deprecate_delete
...
opts: deprecate ListOpts.Delete()
2025-10-13 11:59:30 +02:00
aec24ba92c
Merge pull request #6553 from thaJeztah/update_utils
...
Dockerfile: update buildx to v0.29.1, compose v2.40.0
2025-10-13 11:52:47 +02:00
193db8ec41
opts: deprecate ListOpts.Delete()
...
This method was added as part of a refactor in [moby@1ba1138], at which
time it was used to delete original values for "--host" and "--volume"
after normalizing. This beccame redundant in [moby@6200002], which added
specialized options that used a validate function, which both validated
and normalized inputs.
It's no longer used, so let's mark it deprecated so that we can remove it.
[moby@1ba1138]: https://github.com/moby/moby/commit/1ba11384bf82f824b0efbab31aaca439cfba1b4f
[moby@6200002]: https://github.com/moby/moby/commit/6200002669874f3314856527fecd0c004060913c
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-13 11:47:39 +02:00
5ad9fbdef7
Dockerfile: update golangci-lint to v2.5.0
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-13 10:16:14 +02:00
7abc65bc06
cli/command: remove deprecated ResolveDefaultContext
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-11 00:40:22 +02:00
c2817e2d59
Dockerfile: bump github.com/josephspurrier/goversioninfo to v1.5.0
...
- Upgrade to Go 1.18 minimum version and remove ioutil references
- Move from Travis to GitHub Actions for CI
- Support multiple icons
- Add options to parse version string
full diff: https://github.com/josephspurrier/goversioninfo/compare/v1.4.1...v1.5.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-11 00:11:08 +02:00
f68d8f1f24
scripts/build/mkversioninfo: use permalink in comment
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-11 00:03:50 +02:00
830e1d60ab
Dockerfile: update compose to v2.40.0
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-10 23:59:38 +02:00
9def7748a5
Dockerfile: update buildx to v0.29.1
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-10 23:58:35 +02:00
f8b1b8d165
Dockerfile: bump gotest.tools/gotestsum v1.13.0
...
full diff: https://github.com/gotestyourself/gotestsum/compare/v1.12.3...v1.13.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-10 23:55:52 +02:00
01febbc3bb
Merge pull request #6551 from thaJeztah/remove_legacy_api_versions
...
remove API-version compatibility for API < v1.44
2025-10-10 22:53:01 +02:00
59d228cd98
Merge pull request #6550 from thaJeztah/deprecate_builder_utils
...
cli/command/image/build: deprecate IsArchive utility
2025-10-10 22:46:27 +02:00
5ad91456c7
docs: update some versions in examples
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-10-10 21:23:30 +02:00
Sebastiaan van Stijn
Austin Vazquez
Sebastiaan van Stijn
Rob Murray
Jonathan A. Sternberg
Paweł Gronowski