fed9fa0f72
context list: temporarily add ContextType to JSON output
...
Docker Desktop currently ships with the "cloud integration" wrapper,
which outputs an additional ContextType field in the JSON output.
While this field is non-standard, it made its way into Visual Studio's
Docker integration, which uses this to exclude "aci" and "eci" context
types that are not supported by Visual Studio.
This patch;
- conditionally adds a ContextType field to the JSON output
- but ONLY when using the default "{{json .}}" or "json" formats
(which are the formats used by Visual Studio)
- if the context is a "aci" or "eci" context, that type is
preserved, otherwise the default "moby" type is used.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-31 13:08:31 +02:00
3da25f6c6d
Merge pull request #5097 from thaJeztah/context_test_coverage
...
cli/command/context: improve tests and add coverage for custom metadata in contexts
2024-05-31 12:24:31 +02:00
40a1da8b42
cli/command/context: list: add test for JSON output
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-31 10:54:15 +02:00
2e9eff235d
cli/command/context: test inspecting context with custom metadata
...
The CLI does not currently expose options to add custom metadata to
contexts, but contexts support them.
- update test-utilities to allow setting custom metadata
- update the inspect test to verify that custom metadata is included
when inspecting a context.
- update the import/export tests to verify that custom metadata
is preserved.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-31 10:49:50 +02:00
54291dd47a
cli/command/context: add test-utility to create multiple contexts
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-31 10:31:16 +02:00
8ed44f916f
Merge pull request #4994 from robmry/47639_per-interface-sysctls
...
Document CLI support for per interface sysctls
2024-05-29 11:03:28 +02:00
4d28ae98f4
Merge pull request #5085 from akerouanton/deprecate-api-cors-header
...
docs: deprecate daemon's api-cors-header flag
2024-05-28 23:45:54 +02:00
9d9bb19f01
docs: deprecate daemon's api-cors-header flag
...
Signed-off-by: Albin Kerouanton <albinker@gmail.com>
2024-05-28 12:10:00 +02:00
358d499681
Merge pull request #5090 from thaJeztah/update_alpine
...
Dockerfile: update ALPINE_VERSION to 3.20
2024-05-27 17:52:03 +02:00
7b4171c608
Merge pull request #5092 from thaJeztah/use_containerd_platforms
...
migrate to new github.com/containerd/platforms package
2024-05-27 14:37:39 +02:00
90bd9c5308
Merge pull request #5089 from thaJeztah/bump_buildx
...
Dockerfile: update buildx to v0.14.1, compose v2.27.1
2024-05-27 14:27:21 +02:00
10b4bb073f
Merge pull request #5086 from thaJeztah/update_creds_helper
...
vendor: github.com/docker/docker-credential-helpers v0.8.2
2024-05-27 14:26:42 +02:00
7dc271a8be
migrate to new github.com/containerd/platforms package
...
The github.com/containerd/containerd/platforms package was moved to a separate
module in preparation of the containerd v2.0 release.
Switch to the new module, which means we also remove containerd as a direct
dependency.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-27 11:55:23 +02:00
3cf12ae719
Merge pull request #5091 from thaJeztah/docs_simplify_output
...
docs: use --quiet in example to simplify output
2024-05-27 08:55:22 +02:00
d5d94e46fc
Explain how to use "network connect --driver-opt" to set sysctls
...
Signed-off-by: Rob Murray <rob.murray@docker.com>
2024-05-26 13:19:51 +01:00
7f9dba60e2
Test quoted fields in --driver-opt
...
Signed-off-by: Rob Murray <rob.murray@docker.com>
2024-05-26 13:17:22 +01:00
b7583a2c28
Explain how to use "--network driver-opt" to set sysctls
...
Signed-off-by: Rob Murray <rob.murray@docker.com>
2024-05-26 13:17:22 +01:00
068f118f88
Test quoted field in --network
...
Signed-off-by: Rob Murray <rob.murray@docker.com>
2024-05-26 13:14:01 +01:00
82ed39e319
docs: use --quiet in example to simplify output
...
The output showed the Alpine version that was used for the example,
which can get outdated and distracts from the example steps.
Use --quiet to reduce the output, and to reduce maintenance (i.e.,
no need to keep the output updated with current versions).
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-26 11:43:08 +02:00
e70f68595d
Dockerfile: update ALPINE_VERSION to 3.20
...
Update to the current version of Alpine, which is also the default for
the golang:alpine image
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-26 11:37:01 +02:00
0b7aff333b
Dockerfile: update compose to v2.27.1
...
release notes: https://github.com/docker/compose/releases/tag/v2.27.1
full diff: https://github.com/docker/compose/compare/v2.24.3...v2.27.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-26 11:26:36 +02:00
f0e7e07b8b
Dockerfile: update buildx to v0.14.1
...
- 0.14.1 release notes: https://github.com/docker/buildx/releases/tag/v0.14.1
- 0.14.0 release notes: https://github.com/docker/buildx/releases/tag/v0.14.0
- 0.13.1 release notes: https://github.com/docker/buildx/releases/tag/v0.13.1
- 0.13.0 release notes: https://github.com/docker/buildx/releases/tag/v0.13.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-26 11:16:57 +02:00
05905bd922
vendor: github.com/docker/docker-credential-helpers v0.8.2
...
no changes to vendored code
full diff: https://github.com/docker/docker-credential-helpers/compare/v0.8.1...v0.8.2
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-23 19:13:17 +02:00
421e3b5e91
Merge pull request #5077 from thaJeztah/config_error_handling
...
cli/config: improve handling of errors
2024-05-22 14:39:50 +02:00
dc75e9ed6c
cli/config: do not discard permission errors when loading config-file
...
When attempting to load a config-file that exists, but is not accessible for
the current user, we should not discard the error.
This patch makes sure that the error is returned by Load(), but does not yet
change LoadDefaultConfigFile, as this requires a change in signature.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-22 10:31:59 +02:00
c80adf4e87
cli/config: TestLoadDefaultConfigFile: check that no warnings are printed
...
Loading the config should print no warnings on a successful load.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-22 10:31:59 +02:00
de91207b87
cli/config: add test for dangling symlink for config-file
...
This may need further discussion, but we currently handle dangling
symlinks gracefully, so let's add a test for this, and verify that
we don't replace symlinks with a file.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-22 10:31:58 +02:00
426fb2fd81
cli/config: Load(), LoadDefaultConfigFile(): improve GoDoc
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-22 10:31:47 +02:00
57a1180c52
Merge pull request #5084 from thaJeztah/improve_rm_flag_description
...
run, create: update "--rm" flag description to mention anonymous volumes
2024-05-21 16:26:12 +02:00
997cfa699b
Merge pull request #4996 from vvoland/cli-bin-darwin
...
bake/bin-image-cross: Add darwin
2024-05-21 06:25:30 -06:00
6d21372dbb
run, create: update "--rm" flag description to mention anonymous volumes
...
The "--rm" flag deletes both the container and any anonymous volumes
associated with the container when the container exits.
This patch updates the flag description to also mention volumes.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-05-21 13:52:56 +02:00
49c0e1996a
Merge pull request #5078 from vvoland/hint-no-empty
...
plugins/hooks: Don't show empty hook messages
2024-05-20 17:57:51 +02:00
803b980e9d
Merge pull request #5080 from vvoland/vendor-master-adjust-ctx
...
vendor: github.com/docker/docker master (06e3a49d66fa)
2024-05-20 11:57:27 +02:00
296a6f5872
plugins/hooks: Don't show empty hooks
...
Don't show `Next steps:` with no messages at all when plugin returns an
unitialized value of `HookMessage` (zero-initialization sets its type to
NextSteps and empty template).
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-05-20 11:20:39 +02:00
c5dd1d0951
Merge pull request #5079 from cncal/patch-1
...
docs: fix json syntax error
2024-05-17 15:22:49 +02:00
cbe9469364
Merge pull request #5021 from neersighted/cdi_typos
...
docs: tidy up CDI docs
2024-05-17 15:06:44 +02:00
1527d625f3
Plumb context to API callbacks
...
Signatures of these functions were changed in 80d92fd45007b6395dc2db5f93def3b159dacd7f
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-05-17 14:39:49 +02:00
3fdf377b66
vendor: github.com/docker/docker master (06e3a49d66fa)
...
full diff: https://github.com/docker/docker/compare/v26.1.0...06e3a49d66fa
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-05-17 14:31:01 +02:00
6a4d38c7f2
docs: fix json syntax error
...
Signed-off-by: cncal <flycalvin@qq.com>
2024-05-17 17:47:44 +08:00
4445e77025
Merge pull request #5029 from racequite/master
...
chore: fix function names in comment
2024-05-17 10:11:20 +02:00
ad3bcf8f3d
Merge pull request #5018 from njucjc/remove_dualstack
...
chore: remove deprecated DualStack field
2024-05-16 15:02:40 +02:00
28c5652a09
Merge pull request #5076 from krissetto/update-e2e-engine-version
...
Updated engine versions used in e2e tests
2024-05-16 13:57:34 +02:00
ffd57fac12
Updated engine versions in e2e text matrix
...
Signed-off-by: Christopher Petito <chrisjpetito@gmail.com>
2024-05-16 11:04:30 +00:00
0937c8b926
Merge pull request #5074 from vvoland/update-swarmkit
...
vendor: github.com/moby/swarmkit/v2 master (c1c857e2dca1)
2024-05-15 14:57:00 +02:00
dbf8443668
vendor: github.com/moby/swarmkit/v2 master (c1c857e2dca1)
...
- full diff: 911c97650f...c1c857e2dc
2024-05-15 14:49:56 +02:00
db8b8099b4
Merge pull request #5051 from laurazard/add-plugin-command-metrics
...
Add OTel instrumentation to CLI plugins
2024-05-15 01:59:20 +01:00
5f4f4f64d3
OTel: implement missing MeterProvider `ForceFlush`
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2024-05-15 00:05:31 +01:00
f07834d185
OTel: add `command.time` metric to plugin commands
...
Signed-off-by: Laura Brehm <laurabrehm@hey.com>
2024-05-15 00:05:30 +01:00
61fe22f21a
Merge pull request #5067 from krissetto/adjust-otel-utils
...
Centralize init of Meter/TracerProviders
2024-05-14 16:28:55 +01:00
02537eac59
Use funcs on DockerCli to return Meter/TracerProviders, not initialize them. Initialize them during DockerCli struct init
...
Signed-off-by: Christopher Petito <chrisjpetito@gmail.com>
2024-05-14 15:23:49 +00:00
Sebastiaan van Stijn
Sebastiaan van Stijn
Albin Kerouanton
Albin Kerouanton
Rob Murray
Bjorn Neergaard
Paweł Gronowski
cncal
Christopher Petito
Christopher Petito
Laura Brehm