38fcd1ca63
Merge pull request #4943 from jsternberg/correct-build-command-path
...
builder: correct the command path for docker build
2024-03-16 15:30:43 +01:00
9392831817
builder: correct the command path for docker build
...
The command path sent for `docker build` should be `docker` rather than
`docker build` to be consistent with the other command paths.
* `docker buildx build` has a command path of `docker buildx`
* `docker builder build` has a command path of `docker builder`
* `docker image build` has a command path of `docker image`
The reason this gets set to `docker buildx` rather than `docker buildx
build` is because the `build` portion of the command path is processed
by the plugin. So the command path only contains the portions of the
command path that were processed by this tool.
Since the `build` of `docker build` gets forwarded to `buildx`, it is
not included in the command path.
Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
2024-03-15 11:36:38 -05:00
4e9abfecf5
Merge pull request #4916 from dvdksn/docs-typos-corrections
...
docs: typo fixes and other corrections
2024-03-14 13:20:39 +01:00
8adf1ddb86
Merge pull request #4928 from dvdksn/deprecate-nontls-tcp
...
docs: deprecate TCP connection without TLS
2024-03-14 12:29:42 +01:00
c8e470057a
Merge pull request #4938 from thaJeztah/deprecate_legacy_images
...
deprecate legacy image formats
2024-03-14 12:20:17 +01:00
3da26a5e79
docs: add description and link for --userns flag
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2024-03-14 10:10:49 +01:00
4bb2abaa54
docs: typo fixes and other corrections
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2024-03-14 10:10:49 +01:00
90c33dbfd9
deprecate legacy image formats
...
Mark pulling legacy image formats as deprecated, and describe the
DOCKER_ENABLE_DEPRECATED_PULL_SCHEMA_1_IMAGE environment variable.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-03-12 17:20:33 +01:00
d17b3b2d80
Merge pull request #4937 from crazy-max/update-xx
...
Dockerfile: update to xx 1.4.0
2024-03-12 16:19:19 +01:00
adb018084c
Dockerfile: update to xx 1.4.0
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2024-03-11 14:24:26 +01:00
a2f3f40233
Merge pull request #4936 from thaJeztah/deprecate_eventhandler
...
cli/command: deprecate EventHandler and InitEventHandler
2024-03-11 14:21:19 +01:00
46afd26c45
cli/command: deprecate EventHandler and InitEventHandler
...
This code was only used as part of container.RunStats, so moving the code
there instead as a non-exported type. The actual use also did not have to
handle concurrency, so the mutex is removed in the new location.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-03-11 13:25:22 +01:00
d06f137170
Merge pull request #4934 from thaJeztah/stats_improve
...
cli/command/container: use ping-result for OS-version
2024-03-11 12:59:47 +01:00
b55cf2f71f
Merge pull request #4931 from robmry/internal_network
...
Add a description of '--internal' to the docs
2024-03-11 12:41:29 +01:00
412d6fca9c
Merge pull request #4930 from vvoland/vendor-docker-v26.0.0-rc2
...
vendor: github.com/docker/docker v26.0.0-rc2
2024-03-11 12:39:14 +01:00
5c54f75f2a
cli/command/container: use ping-result for OS-version
...
The daemonOSType variable is already set when collecting stats, so we unlikely
hit this code in practice, and it would only be set if `collect()` failed and
we never got a stats response. If we do need to get this information, let's use
the OSVersion we already obtained from the ping response.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-03-11 11:05:56 +01:00
617377c045
Describe an 'internal' network.
...
Added a description of a '--internal' network (from @neersighted).
Co-authored-by: Bjorn Neergaard <bjorn.neergaard@docker.com>
Signed-off-by: Rob Murray <rob.murray@docker.com>
2024-03-11 09:13:25 +00:00
860b4f3a7d
'docker daemon' flags refer to the default bridge
...
Replace 'docker daemon' with the wording used for the preceeding table,
to make it extra-clear that those flags apply to the default bridge.
Signed-off-by: Rob Murray <rob.murray@docker.com>
2024-03-08 17:11:28 +00:00
645b973521
vendor: github.com/docker/docker v26.0.0-rc2
...
full diff: https://github.com/docker/docker/compare/f4c696eef17d...v26.0.0-rc2
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-03-08 17:10:05 +01:00
3cf2fe0fff
docs: deprecate TCP connection without TLS
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2024-03-08 14:50:15 +01:00
952c807716
Merge pull request #4926 from vvoland/vendor-docker
...
vendor: github.com/docker/docker f4c696eef17d62a42
2024-03-07 19:35:08 +01:00
a8379092af
vendor: github.com/docker/docker f4c696eef17d62a42
...
full diff: https://github.com/docker/docker/compare/v26.0.0-rc1+incompatible...f4c696eef17d62a421877d95c4810185750c5641
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-03-07 19:13:04 +01:00
a1361a1372
Merge pull request #4923 from vvoland/cli-arm64
...
bake: Add `windows/arm64` target to bin-image-cross
2024-03-06 09:08:20 -07:00
ab9d560570
bake: Add `windows/arm64` target to bin-image-cross
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-03-06 16:46:39 +01:00
ba6460829b
Merge pull request #4918 from vvoland/go-1.21.8
...
update to go1.21.8
2024-03-05 22:24:30 +01:00
3b77477943
update to go1.21.8
...
go1.21.8 (released 2024-03-05) includes 5 security fixes:
- crypto/x509: Verify panics on certificates with an unknown public key algorithm (CVE-2024-24783, https://go.dev/issue/65390 )
- net/http: memory exhaustion in Request.ParseMultipartForm (CVE-2023-45290, https://go.dev/issue/65383 )
- net/http, net/http/cookiejar: incorrect forwarding of sensitive headers and cookies on HTTP redirect (CVE-2023-45289, https://go.dev/issue/65065 )
- html/template: errors returned from MarshalJSON methods may break template escaping (CVE-2024-24785, https://go.dev/issue/65697 )
- net/mail: comments in display names are incorrectly handled (CVE-2024-24784, https://go.dev/issue/65083 )
View the release notes for more information:
https://go.dev/doc/devel/release#go1.21.8
- https://github.com/golang/go/issues?q=milestone%3AGo1.21.8+label%3ACherryPickApproved
- full diff: https://github.com/golang/go/compare/go1.21.6...go1.21.8
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-03-05 22:08:26 +01:00
181575bf55
Merge pull request #4888 from Benehiko/fix-prompt-termination
...
fix: cli prompt termination exit code
2024-03-04 07:56:38 -07:00
10bf91a02d
fix: cli prompt termination exit code
...
Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
2024-03-04 15:26:17 +01:00
310daf2db9
Merge pull request #4259 from gmargaritis/373-support-detach-flag-in-stack-rm
...
Add support for --detach flag in stack rm
2024-03-04 10:04:41 +01:00
238d659ff9
Add support for --detach/-d flag in stack rm
...
Added --detach/-d to stack rm. Setting --detach=false waits until
all of the stack tasks have reached a terminal state.
Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: George Margaritis <gmargaritis@protonmail.com>
2024-03-04 09:56:53 +01:00
4a43b8eaed
Merge pull request #4258 from gmargaritis/373-support-detach-in-docker-stack-deploy
...
Add support for --detach flag in stack deploy
2024-03-04 09:45:01 +01:00
b086d72769
Add support for --detach flag in stack deploy
...
Added --detach and --quiet/-q flags to stack deploy. Setting --detach=false
waits until all of the stack services have converged. Shows progress bars for
each individual task, unless --quiet/-q is specified.
Co-authored-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: George Margaritis <gmargaritis@protonmail.com>
2024-03-04 09:36:36 +01:00
35e6a41ff2
Merge pull request #4906 from Benehiko/benehiko/v26.0.0-rc1
...
vendor: github.com/docker/docker v26.0.0-rc1
2024-03-01 18:33:58 +01:00
5e80232398
vendor: github.com/docker/docker v26.0.0-rc1
...
full diff: https://github.com/docker/docker/compare/c70d7905fbd9...v26.0.0-rc1
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
test: update fixtures
Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
2024-03-01 18:23:25 +01:00
19d02cd101
Merge pull request #4896 from Benehiko/help-plugin-descriptions
...
chore: `docker help` should not show plugin vendor and version
2024-02-29 07:32:20 -07:00
ec35bab4fa
Merge pull request #4901 from dvdksn/docs-fix-typo-tty
...
docs: fix typo in tty example
2024-02-29 14:53:02 +01:00
d51ba41791
docs: prefer -it over -ti
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2024-02-29 13:38:53 +01:00
a5b82e9f87
docs: fix typo in tty example
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2024-02-29 13:38:48 +01:00
abe78b79de
chore: `docker help` should not show plugin vendor and version
...
Signed-off-by: Alano Terblanche <18033717+Benehiko@users.noreply.github.com>
2024-02-29 08:47:18 +01:00
9015b71163
Merge pull request #4875 from jsternberg/build-alias-env-var
...
plugins: set OTEL_RESOURCE_ATTRIBUTES when invoking a plugin
2024-02-28 22:02:22 +01:00
5786f20687
plugins: fix encoding for OTEL env var passed to plugin
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2024-02-28 12:43:07 -08:00
85dcacd78f
plugins: set OTEL_RESOURCE_ATTRIBUTES when invoking a plugin
...
When a plugin is invoked, the docker cli will now set
`OTEL_RESOURCE_ATTRIBUTES` to pass OTEL resource attribute names to the
plugin as additional resource attributes. At the moment, the only
resource attribute passed is `cobra.command_path`.
All resource attributes passed by the CLI are prepended with the
namespace `docker.cli` to avoid clashing with existing ones the plugin
uses or ones defined by the user.
For aliased commands like the various builder commands, the command path
is overwritten to match with the original name (such as `docker
builder`) instead of the forwarded name (such as `docker buildx build`).
Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com>
2024-02-28 12:43:05 -08:00
eb306df13d
Merge pull request #4887 from dvdksn/invalid-daemon.json
...
docs: fix invalid daemon.json examples
2024-02-28 18:00:17 +01:00
efb9206433
Merge pull request #4897 from thaJeztah/bump_engine
...
vendor: github.com/docker/docker c70d7905fbd9 (v26.0.0-dev)
2024-02-26 19:24:28 +01:00
acc675014f
vendor: github.com/docker/docker c70d7905fbd9 (v26.0.0-dev)
...
full diff: 86b86412a1...c70d7905fb
2024-02-26 17:54:20 +01:00
79541b7e21
vendor: google.golang.org/grpc v1.59.0
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-26 17:53:12 +01:00
096ced0894
vendor: OTEL v0.46.1 / v1.21.0
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-26 17:50:23 +01:00
f3c77df31e
vendor: github.com/prometheus/client_golang v1.17.0
...
full diffs:
- https://github.com/prometheus/client_golang/compare/v1.14.0...v1.17.0
- https://github.com/prometheus/client_model/compare/v0.3.0...v0.5.0
- https://github.com/prometheus/common/compare/v0.42.0...v0.44.0
- https://github.com/prometheus/procfs/compare/v0.9.0...v0.12.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-26 17:45:07 +01:00
1b42d04d63
vendor: github.com/go-logr/logr v1.3.0
...
full diff: https://github.com/go-logr/logr/compare/v1.2.4...v1.3.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-26 17:39:47 +01:00
f5a29ff8eb
vendor: github.com/containerd/containerd v1.7.13
...
no changes in vendored files
full diff: https://github.com/containerd/containerd/compare/v1.7.12...v1.7.13
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-26 17:36:46 +01:00
Sebastiaan van Stijn
Jonathan A. Sternberg
Paweł Gronowski
David Karlsson
Sebastiaan van Stijn
CrazyMax
Rob Murray
Bjorn Neergaard
Alano Terblanche
George Margaritis
Tonis Tiigi