Sebastiaan van Stijn and GitHub
2ae51e2d69
Merge pull request #6656 from vvoland/img-list-notty-width
...
image/tree: Don't limit name width if non tty
2025-11-13 13:19:30 +01:00
Paweł Gronowski
ed281ddf52
image/list: Print legend only if limiting width
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2025-11-13 13:00:02 +01:00
Paweł Gronowski
aa5d00a3a4
image/tree: Don't limit name width if non tty
...
Previously when no terminal was attached the width was assumed to be 80.
This is too short for most image names which truncated the names when
output was redirect (for example to `grep`).
This disabled the name truncation if the terminal width can't be
determined.
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2025-11-13 12:59:46 +01:00
Sebastiaan van Stijn and GitHub
c44e8a0727
Merge pull request #6648 from thaJeztah/cli_version_json_format
...
cli/command/system: define struct for formatting version
2025-11-12 18:09:53 +01:00
Sebastiaan van Stijn
bff56f0493
cli/command/system: define struct for formatting version
...
The client.ServerVersion method in the moby/client module defines
an output struct that's separate from the API response. These output
structs are not designed to be marshaled as JSON, but the CLI depended
on them defining `json` labels, which it used to format the output
as JSON (`docker version --format=json`); as a result, the JSON output
changed in docker v29, as it would now use the naming based on the Go
struct's fields (`APIVersion` instead of `ApiVersion`).
In future, we should consider having a `--raw` (or similar) option for
the CLI to print API responses as-is, instead of using client structs
or CLI structs for this (this would also make sure the JSON output does
not inherit client-side formatting of fields).
For now, let's create a struct for formatting the output, similar to what
we do for the client-side information.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-12 14:57:13 +01:00
Sebastiaan van Stijn and GitHub
3d4129b9ea
Merge pull request #6644 from thaJeztah/connhelper_nowarn
...
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 (alpine, 29-rc, connhelper-ssh) (push) Has been cancelled
e2e / tests (alpine, 29-rc, 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
e2e / tests (debian, 29-rc, connhelper-ssh) (push) Has been cancelled
e2e / tests (debian, 29-rc, 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
cli/connhelper/commandcon: remove warn logs
v29.0.0
2025-11-10 22:42:38 +01:00
Sebastiaan van Stijn
d787e70a14
cli/connhelper/commandcon: remove warn logs
...
These were originally added in 6f61cf053a ,
but at the time, the error wasn't returned. Now that it is, we shouldn't
log _and_ return the error.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-10 22:36:41 +01:00
Paweł Gronowski and GitHub
e730f6f0f3
Merge pull request #6643 from thaJeztah/bump_modules2
...
vendor: github.com/moby/moby/api v1.52.0, moby/client v0.1.0
2025-11-10 22:04:44 +01:00
Paweł Gronowski and GitHub
6ac3f93755
Merge pull request #6578 from thaJeztah/bump_otel_semconv
...
cli/command: update to semconv v1.37.0, otel v1.38.0
2025-11-10 22:04:29 +01:00
Sebastiaan van Stijn
ebc1995f9f
vendor: github.com/moby/moby/api v1.52.0, moby/client v0.1.0
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-10 21:57:40 +01:00
Sebastiaan van Stijn and GitHub
31d1a59d07
Merge pull request #6642 from vvoland/swarm-compose-work
...
swarm: revert compose/stack support for memory swappiness
2025-11-10 19:09:49 +01:00
Paweł Gronowski
ad96811f12
swarm: Add memory swap support (no stack/compose support)
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2025-11-10 17:48:56 +01:00
Paweł Gronowski
6ba06b5fb4
Revert "cli/compose: add schema 3.14 (no changes from 3.13 yet)"
...
This reverts commit d0c86d39ef .
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2025-11-10 17:48:55 +01:00
Paweł Gronowski
e0716b571f
Revert "Add memory swap to swarm"
...
This reverts commit 71828f2792 .
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2025-11-10 17:48:54 +01:00
Paweł Gronowski and GitHub
179efae8b0
Merge pull request #6641 from thaJeztah/bump_modules
...
vendor: github.com/moby/moby/api, moby/client master
2025-11-10 17:03:43 +01:00
Sebastiaan van Stijn
4b450f113b
vendor: github.com/moby/moby/api, moby/client master
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-10 16:32:05 +01:00
Paweł Gronowski and GitHub
ee244f2f44
Merge pull request #6636 from thaJeztah/add_missing_gobuild
...
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 (alpine, 29-rc, connhelper-ssh) (push) Has been cancelled
e2e / tests (alpine, 29-rc, 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
e2e / tests (debian, 29-rc, connhelper-ssh) (push) Has been cancelled
e2e / tests (debian, 29-rc, 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
cli/command/system: add missing "go:build"
v29.0.0-rc.3
2025-11-07 01:34:14 +01:00
Paweł Gronowski and GitHub
0c101c4aa7
Merge pull request #6635 from thaJeztah/bump_modules
...
vendor: github.com/moby/moby/api v1.52.0-rc.1, moby/client v0.1.0-rc.1
2025-11-07 01:31:10 +01:00
Sebastiaan van Stijn
1d789e4099
cli/command/system: add missing "go:build"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-07 01:27:47 +01:00
Sebastiaan van Stijn
b3824015d6
vendor: github.com/moby/moby/api v1.52.0-rc.1, moby/client v0.1.0-rc.1
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-07 01:26:13 +01:00
Sebastiaan van Stijn and GitHub
c4f240cc7d
Merge pull request #6606 from dvdksn/update-libnetwork-docs-link
...
docs: update link to libnetwork protocol doc
2025-11-07 01:12:41 +01:00
Sebastiaan van Stijn and GitHub
5b443bf269
Merge pull request #6619 from dperny/swarm-memory-swap
...
Add memory swap to swarm
2025-11-07 01:03:26 +01:00
Sebastiaan van Stijn and GitHub
eaa6114d9e
Merge pull request #6634 from thaJeztah/remove_replace
...
vendor.mod: remove replace
2025-11-07 00:55:53 +01:00
Sebastiaan van Stijn and GitHub
c9e6b41293
Merge pull request #6633 from dvdksn/docs-update-dd-documentation-link
...
chore: update broken link to restrucured docker desktop documentation
2025-11-07 00:34:43 +01:00
Sebastiaan van Stijn
d67291026e
vendor.mod: remove replace
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-07 00:32:57 +01:00
Austin Vazquez and Sebastiaan van Stijn
41088ed7d0
vendor: go.opentelemetry.io/auto/sdk v1.2.1
...
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-07 00:29:26 +01:00
Austin Vazquez and Sebastiaan van Stijn
712f569f17
vendor: go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.63.0
...
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-07 00:29:26 +01:00
Sebastiaan van Stijn
7736f5e606
vendor: align other otel packages to v1.38.0
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-07 00:29:24 +01:00
Jonathan A. Sternberg and Sebastiaan van Stijn
d45551dac9
cli/command: update to semconv v1.37.0, otel v1.38.0
...
Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-07 00:27:34 +01:00
Drew Erny and Sebastiaan van Stijn
71828f2792
Add memory swap to swarm
...
Adds support for setting memory swap settings on Swarm services
* Adds flags `memory-swap` and `memory-swappiness` to `docker service
create` and `docker service update` commands.
* Adds compose fields `memswap_limit` and `mem_swappiness` for `docker
stack` commands.
Signed-off-by: Drew Erny <derny@mirantis.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-07 00:24:44 +01:00
Sebastiaan van Stijn
d0c86d39ef
cli/compose: add schema 3.14 (no changes from 3.13 yet)
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-07 00:24:44 +01:00
Paweł Gronowski and GitHub
16d2036cde
Merge pull request #6620 from austinvazquez/vendor-system-disk-usage-changes
...
vendor: github.com/moby/moby/api master, moby/client master
2025-11-07 00:20:18 +01:00
Austin Vazquez
5039eee77f
vendor: github.com/moby/moby/api master, moby/client master
...
Signed-off-by: Austin Vazquez <austin.vazquez@docker.com >
2025-11-06 17:02:53 -06:00
Sebastiaan van Stijn and GitHub
cc7275c4e5
Merge pull request #6121 from thaJeztah/trust_plugin
...
implement `docker trust` as plugin
2025-11-06 20:29:58 +01:00
Sebastiaan van Stijn and GitHub
f7d6d5bdb3
Merge pull request #6632 from vvoland/update-go
...
update to go1.25.4
2025-11-06 17:13:16 +01:00
Sebastiaan van Stijn
cee9ea67fc
lint: run in go-modules mode
...
Prevent the linter from recursing to other modules (cmd/docker-trust),
which don't have their dependencies vendored.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-06 15:24:49 +01:00
Sebastiaan van Stijn
b2aa690b26
scripts/build/binary: remove pkcs11 build tag
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-06 15:24:49 +01:00
Sebastiaan van Stijn
c1a53ae7b6
cmd/docker-trust: remove dependency on cli/internal
...
Create a copy of the registry package to use, so that code used only
for trust can be removed from the cli/internal package.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-06 15:24:49 +01:00
Sebastiaan van Stijn
06914dd0ff
make trust-plugin a separate module
...
skip cmd/docker-trust in tests, as it's a separate module.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-06 15:24:48 +01:00
Sebastiaan van Stijn
c9bb291154
implement docker trust as plugin
...
move the `trust` subcommands to a plugin, so that the subcommands can
be installed separate from the `docker trust` integration in push/pull
(for situations where trust verification happens on the daemon side).
make binary
go build -o /usr/libexec/docker/cli-plugins/docker-trust ./cmd/docker-trust
docker info
Client:
Version: 28.2.0-dev
Context: default
Debug Mode: false
Plugins:
buildx: Docker Buildx (Docker Inc.)
Version: v0.24.0
Path: /usr/libexec/docker/cli-plugins/docker-buildx
trust: Manage trust on Docker images (Docker Inc.)
Version: unknown-version
Path: /usr/libexec/docker/cli-plugins/docker-trust
docker trust --help
Usage: docker trust [OPTIONS] COMMAND
Extended build capabilities with BuildKit
Options:
-D, --debug Enable debug logging
Management Commands:
key Manage keys for signing Docker images
signer Manage entities who can sign Docker images
Commands:
inspect Return low-level information about keys and signatures
revoke Remove trust for an image
sign Sign an image
Run 'docker trust COMMAND --help' for more information on a command.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-06 15:24:46 +01:00
Sebastiaan van Stijn and GitHub
face4a61be
Merge pull request #6631 from thaJeztah/fix_static_builds
...
Fix static build + CGO
2025-11-06 15:24:18 +01:00
David Karlsson
dd70b43bc1
chore: update broken link to restrucured docker desktop documentation
...
Signed-off-by: David Karlsson <35727626+dvdksn@users.noreply.github.com >
2025-11-06 14:40:16 +01:00
Paweł Gronowski
f2755b02d7
update to go1.25.4
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2025-11-06 14:24:03 +01:00
Tianon Gravi and Sebastiaan van Stijn
880ef756b7
Fix static build + CGO
...
Signed-off-by: Tianon Gravi <admwiggin@gmail.com >
2025-11-06 12:39:18 +01:00
Paweł Gronowski and GitHub
de00f53cb9
Merge pull request #6629 from thaJeztah/bump_x_deps
...
vendor: golang.org/x/* dependencies
2025-11-06 11:22:48 +01:00
Sebastiaan van Stijn
0976389e14
vendor: golang.org/x/net v0.46.0, golang.org/x/crypto v0.43.0
...
full diff: https://github.com/golang/net/compare/v0.39.0...v0.46.0
full diff: https://github.com/golang/crypto/compare/v0.39.0...v0.43.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-05 22:58:37 +01:00
Sebastiaan van Stijn
c733cb0532
vendor: golang.org/x/time v0.14.0
...
full diff: https://github.com/golang/time/compare/v0.11.0...v0.14.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-05 22:47:59 +01:00
Sebastiaan van Stijn
1f77c6f1c8
vendor: golang.org/x/term v0.36.0
...
- term: remove duplicate flag and add comment on windows
- term: allow multi-line bracketed paste to not create single line
with verbatim LFs (fixes "x/term: multi line bracketed paste fails"
to issue line by line commands
full diff: https://github.com/golang/term/compare/v0.32.0...v0.36.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-05 22:47:50 +01:00
Sebastiaan van Stijn
dcce972f47
vendor: golang.org/x/text v0.30.0
...
full diff: https://github.com/golang/text/compare/v0.26.0...v0.30.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-05 22:47:22 +01:00
Sebastiaan van Stijn
b11d143cd1
vendor: golang.org/x/sync v0.17.0
...
full diff: https://github.com/golang/sync/compare/v0.16.0...v0.17.0
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-11-05 22:46:32 +01:00