Sebastiaan van Stijn
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
David Karlsson
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
David Karlsson
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
Sebastiaan van Stijn
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
Tonis Tiigi
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
Jonathan A. Sternberg
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
Paweł Gronowski
eb306df13d
Merge pull request #4887 from dvdksn/invalid-daemon.json
...
docs: fix invalid daemon.json examples
2024-02-28 18:00:17 +01:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
acc675014f
vendor: github.com/docker/docker c70d7905fbd9 (v26.0.0-dev)
...
full diff: 86b86412a1...c70d7905fb
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-26 17:54:20 +01:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
dc6bfac81a
Merge pull request #4331 from vvoland/mount-volsubpath
...
mount: Add volume-subpath option
2024-02-23 17:29:42 +01:00
Sebastiaan van Stijn
9767d02493
Merge pull request #4894 from crazy-max/codecov-token
...
ci: set codecov token
2024-02-22 23:20:49 +01:00
CrazyMax
2663c10574
ci: set codecov token
...
Signed-off-by: CrazyMax <crazy-max@users.noreply.github.com>
2024-02-22 18:11:18 +01:00
David Karlsson
48a670f26b
docs: fix invalid daemon.json examples
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2024-02-21 12:29:31 +01:00
Sebastiaan van Stijn
1443014cbd
Merge pull request #4884 from thaJeztah/regenerate_mdddocs
...
docs: regenerate markdown
2024-02-21 11:33:23 +01:00
Sebastiaan van Stijn
f2e98f9a93
docs: regenerate markdown
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-21 10:40:13 +01:00
Sebastiaan van Stijn
f6b7a11b93
Merge pull request #4866 from dvdksn/docs-cli-reference-urlscheme
...
docs: update link targets
2024-02-21 09:18:52 +01:00
David Karlsson
caf72655fb
docs: update url scheme for reference docs
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2024-02-20 21:38:50 +01:00
David Karlsson
e244044944
deps: update cli-docs-tool version (v0.7.0)
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com>
2024-02-20 08:31:53 +01:00
Sebastiaan van Stijn
a10debe6c4
Merge pull request #4881 from thaJeztah/update_go_1.21.7
...
update to go1.21.7
2024-02-19 15:18:52 +01:00
Sebastiaan van Stijn
20b9d489e0
update to go1.21.7
...
go1.21.7 (released 2024-02-06) includes fixes to the compiler, the go command,
the runtime, and the crypto/x509 package. See the Go 1.21.7 milestone on our
issue tracker for details:
- https://github.com/golang/go/issues?q=milestone%3AGo1.21.7+label%3ACherryPickApproved
- full diff: https://github.com/golang/go/compare/go1.21.6...go1.21.7
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-19 14:13:51 +01:00
Paweł Gronowski
67105e0995
Merge pull request #4876 from systemmonkey42/patch-1
...
Fixed typo in bash completion functions
2024-02-19 11:50:49 +01:00
David le Blanc
c514003e69
Fixed typo in bash completion functions
...
Signed-off-by: David le Blanc <david-le-blanc@users.noreply.github.com>
2024-02-17 17:11:28 +11:00
Sebastiaan van Stijn
49a44fb73f
Merge pull request #4879 from qyanu-pull-requests/master
...
man/docker-build.1: typo in parameter variable: CID => IID
2024-02-16 18:27:24 +01:00
Max-Julian Pogner
ff5b0d18fe
man/docker-build.1: typo in parameter variable: CID => IID
...
--iidfile logically specifies the IIDFILE and not the CIDFILE
(use --cidfile from docker-run.1.md for specifying a cidfile).
Signed-off-by: Max-Julian Pogner <max-julian@pogner.at>
2024-02-16 11:10:06 +01:00
Sebastiaan van Stijn
21d96ffb8f
Merge pull request #4839 from krissetto/upgrade-ci
...
update CI
2024-02-15 14:09:42 +01:00
Sebastiaan van Stijn
155b5b4eaa
Merge pull request #4872 from thaJeztah/use_non_deprecated_uuid
...
cli-plugins/socket: remove use of deprecated distribution uuid package
2024-02-14 10:33:46 +01:00
Sebastiaan van Stijn
3b5e814242
cli-plugins/socket: remove use of deprecated distribution uuid package
...
The "github.com/docker/distribution" module moved to the distribution
org ("github.com/docker/distribution/v3"), and the new module deprecated
and removed the uuid package in favor of Google's UUID package.
While we still depend on the old module through packages and as an indirect
dependency, we may want to try avoid using it.
This patch replaces the use for the socket package, and replaces it for a
local utility, taking the same approach as `stringid.GenerateRandomID()`,
which should be random enough for this purpose.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-13 16:24:53 +01:00
Christopher Petito
69ed6588a8
Cleanup of dockerfiles, compose files and env vars
...
Signed-off-by: Christopher Petito <chrisjpetito@gmail.com>
2024-02-13 13:32:45 +00:00
Christopher Petito
6b67b95493
Update gha runners and engines used in e2e tests
...
- gha runners updated to ubuntu 22.04
- e2e now runs against moby 23.0, 24.0 and 25.0
- temporarily skip broken test for moby < 25
Signed-off-by: Christopher Petito <chrisjpetito@gmail.com>
2024-02-13 13:30:09 +00:00
Paweł Gronowski
edc09e6038
mount: Add `volume-subpath` option
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-02-13 14:04:00 +01:00
Sebastiaan van Stijn
a253318869
Merge pull request #4873 from vvoland/test-daemon-apiversion
...
testenv: Add DaemonAPIVersion helper
2024-02-13 13:50:35 +01:00
Paweł Gronowski
9831fea4db
testenv: Add DaemonAPIVersion helper
...
Allow tests to check the negotiated API version used by the client.
Can be used to skip tests based on API versions, for example:
```go
skip.If(t, versions.LessThan(environment.DaemonAPIVersion(t), "1.44"))
```
will skip the test if the API version is older than 1.44
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
2024-02-12 16:29:47 +01:00
Christopher Petito
d1b88930c3
Merge pull request #4867 from krissetto/test-fixes
...
Test fixes needed for upgrading ci runners and engine
2024-02-12 14:40:22 +01:00
Sebastiaan van Stijn
d7f195833d
Merge pull request #4862 from catap/openbsd
...
Avoid keeping @docker_cli_[UUID] files
2024-02-12 13:53:33 +01:00
Sebastiaan van Stijn
b807ea8084
Merge pull request #4868 from thaJeztah/update_engine
...
vendor: github.com/docker/docker 86b86412a1b7 (v26.0-dev)
2024-02-12 09:36:04 +01:00
Sebastiaan van Stijn
1cda2c45f8
Merge pull request #4869 from thaJeztah/commandcon_cleanup
...
cli/connhelper/commandconn: inline variables
2024-02-12 07:46:14 +01:00
Sebastiaan van Stijn
8bae662713
cli/connhelper/commandconn: inline variables
...
Inline the variables used to define the command + args used in the
tests, which makes it slightly easier to see what's run.
Also explicitly define a context, in case we want to add telemetry
to these tests.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-10 13:59:36 +01:00
Sebastiaan van Stijn
df6220d434
vendor: github.com/docker/docker 86b86412a1b7 (v26.0-dev)
...
full diff: 9e075f3808...86b86412a1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-10 12:26:39 +01:00
Christopher Petito
30dd7c1319
Minor test fixes necessary for eventually upgrading ci runners and engine version
...
Signed-off-by: Christopher Petito <chrisjpetito@gmail.com>
2024-02-09 13:55:03 +00:00
Kirill A. Korinsky
2c214241fa
Avoid keeping @docker_cli_[UUID] files
...
Seems that OpenBSD behaves like darwin and requires to unlink all
socket, after it was used.
Tested on OpenBSD 7.4
Signed-off-by: Kirill A. Korinsky <kirill@korins.ky>
2024-02-09 00:19:27 +01:00
Sebastiaan van Stijn
34797d1678
Merge pull request #4860 from robmry/4859_compose_extra_hosts_eq_sep
...
docker stack: allow '=' separator in extra_hosts
2024-02-08 17:08:47 +01:00
Rob Murray
c986d09bca
docker stack: allow '=' separator in extra_hosts
...
extra_hosts in the compose file format allows '=' as a separator, and brackets
around IP addresses, the engine API doesn't.
So, transform the values when reading a compose file for 'docker stack'.
Signed-off-by: Rob Murray <rob.murray@docker.com>
2024-02-07 17:57:17 +00:00
Sebastiaan van Stijn
79fa65e7b5
Merge pull request #4835 from thaJeztah/update_engine_api_removal
...
vendor: github.com/docker/docker 9e075f3808a5 (master, v26.0.0-dev)
2024-02-07 10:47:21 +01:00
Sebastiaan van Stijn
324309b086
vendor: github.com/docker/docker 9e075f3808a5 (master, v26.0.0-dev)
...
Vendor docker/docker with API < 1.24 removed. This should not affect client
code.
43ffb1ee9d..9e075f3808
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-07 02:27:53 +01:00
Sebastiaan van Stijn
93ad9fbdf6
vendor: github.com/moby/swarmkit/v2 v2.0.0-20240125134710-dcda100a8261
...
full diff: f082dd7a0c...dcda100a82
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2024-02-07 02:23:51 +01:00