0ee20b8543
Merge pull request #5995 from vvoland/swarm-init-cacert
...
swarm/init: Fix `--external-ca` ignoring `cacert` option
2025-05-21 18:31:14 +02:00
c07cd8aaad
Merge pull request #6091 from thaJeztah/remove_deprecated_isautomated
...
search: remove deprecated "IsAutomated" placeholder
2025-05-21 15:43:36 +00:00
6e4315f599
search: remove deprecated "IsAutomated" placeholder
...
IsAutomated was deprecated in 4fc3f0e6f6github@gone.nl >
2025-05-21 17:13:59 +02:00
97e060e7b1
Merge pull request #6042 from thaJeztah/carry_5804_docker_ps_platform
...
docker ps: add "Platform" as formatting option
2025-05-21 12:28:57 +00:00
67c0be4b05
docker ps: allow formatting as JSON
...
With this patch:
docker ps --format 'table {{.Names}}\t{{.Platform}}'
NAMES PLATFORM
optimistic_nightingale linux/arm64
mycontainer linux/arm64/v8
trusting_goldstine linux/arm64
docker ps --format '{{.Platform}}'
linux/arm64
linux/arm64/v8
linux/arm64
docker ps --format '{{json .Platform}}'
{"architecture":"arm64","os":"linux"}
{"architecture":"arm64","os":"linux","variant":"v8"}
{"architecture":"arm64","os":"linux"}
docker ps --format 'json'
{"Command":"\"/bin/bash\"","CreatedAt":"2025-05-13 10:12:19 +0000 UTC","ID":"e8b3b2d604f1","Image":"docker-cli-dev","Labels":"desktop.docker.io/binds/0/Source=/Users/thajeztah/go/src/github.com/docker/cli,desktop.docker.io/binds/0/SourceKind=hostFile,desktop.docker.io/binds/0/Target=/go/src/github.com/docker/cli,desktop.docker.io/mounts/0/Source=/var/run/docker.sock,desktop.docker.io/mounts/0/SourceKind=dockerSocketProxied,desktop.docker.io/mounts/0/Target=/var/run/docker.sock,desktop.docker.io/ports.scheme=v2","LocalVolumes":"1","Mounts":"/host_mnt/User…,docker-cli-dev…,/run/host-serv…","Names":"optimistic_nightingale","Networks":"bridge","Platform":{"architecture":"arm64","os":"linux"},"Ports":"","RunningFor":"38 minutes ago","Size":"0B","State":"running","Status":"Up 38 minutes"}
{"Command":"\"/docker-entrypoint.…\"","CreatedAt":"2025-05-13 09:58:01 +0000 UTC","ID":"c93b808dd54e","Image":"nginx:alpine","Labels":"desktop.docker.io/ports.scheme=v2,maintainer=NGINX Docker Maintainers \u003cdocker-maint@nginx.com \u003e","LocalVolumes":"0","Mounts":"","Names":"mycontainer","Networks":"bridge","Platform":{"architecture":"arm64","os":"linux","variant":"v8"},"Ports":"80/tcp","RunningFor":"53 minutes ago","Size":"0B","State":"running","Status":"Up 53 minutes"}
{"Command":"\"/usr/bin/gotty --ti…\"","CreatedAt":"2025-05-13 07:31:18 +0000 UTC","ID":"cbb981b06e46","Image":"thajeztah/dockershell:latest","Labels":"desktop.docker.io/ports.scheme=v2,com.thajeztah.docker-shell=1","LocalVolumes":"0","Mounts":"","Names":"trusting_goldstine","Networks":"bridge","Platform":{"architecture":"arm64","os":"linux"},"Ports":"0.0.0.0:55000-\u003e8080/tcp","RunningFor":"3 hours ago","Size":"0B","State":"running","Status":"Up 3 hours"}
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-21 12:44:38 +02:00
7aa6c79c0a
docker ps: add "Platform" as formatting option
...
docker ps --format 'table {{.ID}}\t{{.Image}}{{.Command}}\t{{.RunningFor}}\t{{.Status}}\t{{.Ports}}\t{{.Names}}\t{{.Platform}}'
CONTAINER ID IMAGECOMMAND CREATED STATUS PORTS NAMES PLATFORM
e422855eac55 docker-cli-dev"/bin/bash" 12 minutes ago Up 12 minutes strange_jennings linux/arm64
Signed-off-by: Jonathan A. Sternberg <jonathan.sternberg@docker.com >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-21 12:43:01 +02:00
af090512a6
Merge pull request #6084 from thaJeztah/bump_engine
...
vendor: github.com/docker/docker 8601b22f5db5 (v28.2-dev)
2025-05-20 10:57:13 +02:00
067587bf15
Merge pull request #6085 from thaJeztah/bump_cli_docs_tool
...
vendor: github.com/docker/cli-docs-tool v0.10.0
2025-05-20 09:30:29 +02:00
ed5d9757c9
vendor: github.com/docker/docker 8601b22f5db5 (v28.2-dev)
...
full diff: https://github.com/docker/docker/compare/v28.2.0-rc.1...8601b22f5db511354d643a7722d11d33aa7ae13f
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-19 22:47:14 +02:00
89f38282fd
vendor: github.com/docker/docker v28.2.0-rc.1
...
no diff: same commit, but tagged
full diff: https://github.com/docker/docker/compare/7937f0846c13...v28.2.0-rc.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-19 22:40:55 +02:00
915b3fe992
vendor: github.com/docker/cli-docs-tool v0.10.0
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-19 17:44:21 +02:00
0ffb72419a
Merge pull request #6083 from thaJeztah/bump_engine
...
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, 23, connhelper-ssh) (push) Has been cancelled
e2e / tests (alpine, 23, local) (push) Has been cancelled
e2e / tests (alpine, 26, connhelper-ssh) (push) Has been cancelled
e2e / tests (alpine, 26, 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, 23, connhelper-ssh) (push) Has been cancelled
e2e / tests (debian, 23, local) (push) Has been cancelled
e2e / tests (debian, 26, connhelper-ssh) (push) Has been cancelled
e2e / tests (debian, 26, 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-13) (push) Has been cancelled
test / host (macos-14) (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/docker/docker 7937f0846c13 (master, v28.x dev)
2025-05-19 14:27:28 +02:00
4665398a06
vendor: github.com/docker/docker 7937f0846c13 (master, v28.x dev)
...
full diff: 4b9f0707a0...7937f0846cgithub@gone.nl >
2025-05-19 14:07:50 +02:00
d1857decba
Merge pull request #6081 from thaJeztah/unify_cli_opts
...
cli/command, cli-plugins/plugin: some cleanups in WithInitializeClient, withPluginClientConn
2025-05-19 11:28:11 +02:00
240b06991b
cli-plugins/plugin: rewrite withPluginClientConn w/ WithAPIClient
...
The WithInitializeClient looks redundant altogether, so let's
rewrite this function to not depend on it.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 23:36:20 +02:00
7b1f889074
cli/command: make WithInitializeClient a wrapper for WithAPIClient
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 23:31:53 +02:00
0d82ff4ae1
cli/command: move WithInitializeClient to other options
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 23:29:52 +02:00
8e5fb5bd07
Merge pull request #6080 from vvoland/vendor-docker
...
vendor: github.com/docker/docker v28.2.0-dev (4b9f0707a039)
2025-05-16 19:22:18 +00:00
8c8a81eaea
vendor: github.com/docker/docker v28.2.0-dev (4b9f0707a039)
...
full diff: b45aa469ca...4b9f0707a0pawel.gronowski@docker.com >
2025-05-16 21:12:49 +02:00
0674a0085a
Merge pull request #6079 from thaJeztah/less_errdefs
...
remove uses of github.com/docker/docker/errdefs
2025-05-16 21:06:21 +02:00
1058b22800
cli/command: remove errdefs uses
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 20:30:00 +02:00
eebf6824fc
cli/command/plugin: remove errdefs uses
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 20:30:00 +02:00
214d2bfb6b
cli/command/image: remove errdefs uses
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 20:30:00 +02:00
c4009463a7
cli/command/builder: remove errdefs uses
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 20:30:00 +02:00
3d68a39015
cli/command/system: remove errdefs uses
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 20:30:00 +02:00
251725676e
cli/command/trust: remove errdefs uses
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 20:29:50 +02:00
1168edb259
cli/command/volume: use stdlib errors, remove errdefs uses
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 20:29:39 +02:00
981e75e0f4
cli/command/network: use stdlib errors, remove errdefs uses
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 20:28:59 +02:00
3382ee3e99
cli/command/context: use stdlib errors, remove errdefs uses
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 20:18:41 +02:00
b883976531
cli/context/store: use stdlib errors, remove errdefs uses
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 20:18:40 +02:00
bfc6aeca4a
cli/command/container: define local errors instead of errdefs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 20:18:40 +02:00
eee0cf9117
Merge pull request #6078 from vvoland/info-devices
...
system/info: Show discovered devices
2025-05-16 19:59:07 +02:00
f6a077a831
system/info: Show discovered devices
...
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com >
2025-05-16 19:35:29 +02:00
be03dc9ce7
vendor: github.com/docker/docker v28.2.0-dev (b45aa469cac7)
...
full diff: c04dec1143...b45aa469capawel.gronowski@docker.com >
2025-05-16 19:35:27 +02:00
628b2f1a81
Merge pull request #6074 from thaJeztah/c8d_errdefs_is
...
switch to github.com/containerd/errdefs for error-matching
2025-05-16 18:11:26 +02:00
d43b7daeb7
Merge pull request #6075 from thaJeztah/bump_engine
...
vendor: github.com/docker/docker c04dec11437f (master, v28.x dev)
2025-05-16 17:27:37 +02:00
7e609d491b
vendor: github.com/docker/docker c04dec11437f (master, v28.x dev)
...
full diff: fd1a78e0a3...c04dec1143github@gone.nl >
2025-05-16 17:01:28 +02:00
d956110288
Merge pull request #1581 from thaJeztah/dont_use_tls_for_sockets
...
Don't use TLS for socket connections
2025-05-16 15:45:13 +02:00
557cabb71e
switch to github.com/containerd/errdefs for error-matching
...
replace uses of docker/errdefs.IsXXX utilities with their containerd/errdefs
equivalent.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 15:27:43 +02:00
c108da5d19
Merge pull request #6070 from thaJeztah/enable_importas_linter
...
golangci-lint: enable importas linter
2025-05-16 15:07:31 +02:00
12992f76e0
Merge pull request #6073 from thaJeztah/format_cleanups_and_fixes
...
cli/command/formatter: fix .Labels format being randomized
2025-05-16 15:01:38 +02:00
5ee17eefe6
cli/command/formatter: fix .Labels format being randomized
...
The labels are stored as a map, causing the output to be randomized.
This patch sorts the result to get a consistent output.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 14:11:56 +02:00
e6bf6dcd90
cli/command/formatter: minor cleanups
...
no need to initialize with an empty string
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 14:10:34 +02:00
43e496b396
cli/command/inspect: minor cleanup and improvements
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 14:10:31 +02:00
cacd86c3f3
Merge pull request #6072 from thaJeztah/bump_version
...
bump version to v28.2.0-dev
2025-05-16 11:44:29 +00:00
8752709427
Merge pull request #6071 from thaJeztah/update_authors2
...
update authors and mailmap
2025-05-16 11:44:12 +00:00
f03aeddfcc
bump version to v28.2.0-dev
...
This file is only used as default if no version is specified. We
should probably get rid of this, but let's update it to better
reflect the version that developer builds are building.
d48fb9f9f7/docker.Makefile (L22)github@gone.nl >
2025-05-16 13:00:20 +02:00
49f2dd0761
update .mailmap and authors
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 12:58:03 +02:00
9f68bc0a2b
golangci-lint: enable importas linter
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 12:36:30 +02:00
378e754c88
use consistent alias for gotest.tools/v3/assert/cmp
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2025-05-16 12:36:14 +02:00
