p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,175 Commits 1 Branch 0 Tags
0ee20b85430eaab286f79bbce9964277f68d5077
Commit Graph

2125 Commits

Author SHA1 Message Date
Sebastiaan van Stijn
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
Sebastiaan van Stijn
6e4315f599 search: remove deprecated "IsAutomated" placeholder 
IsAutomated was deprecated in 4fc3f0e6f6
(docker v25.0), and marked for removal in docker 26.0 (which we missed).
This removes it.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-21 17:13:59 +02:00
Sebastiaan van Stijn
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
Jonathan A. Sternberg
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
4665398a06 vendor: github.com/docker/docker 7937f0846c13 (master, v28.x dev) 
full diff: 4b9f0707a0...7937f0846c

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-19 14:07:50 +02:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Paweł Gronowski
8c8a81eaea vendor: github.com/docker/docker v28.2.0-dev (4b9f0707a039) 
full diff: b45aa469ca...4b9f0707a0

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2025-05-16 21:12:49 +02:00
Sebastiaan van Stijn
1058b22800 cli/command: remove errdefs uses 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 20:30:00 +02:00
Sebastiaan van Stijn
eebf6824fc cli/command/plugin: remove errdefs uses 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 20:30:00 +02:00
Sebastiaan van Stijn
214d2bfb6b cli/command/image: remove errdefs uses 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 20:30:00 +02:00
Sebastiaan van Stijn
c4009463a7 cli/command/builder: remove errdefs uses 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 20:30:00 +02:00
Sebastiaan van Stijn
3d68a39015 cli/command/system: remove errdefs uses 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 20:30:00 +02:00
Sebastiaan van Stijn
251725676e cli/command/trust: remove errdefs uses 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 20:29:50 +02:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Paweł Gronowski
f6a077a831 system/info: Show discovered devices 
Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2025-05-16 19:35:29 +02:00
Paweł Gronowski
be03dc9ce7 vendor: github.com/docker/docker v28.2.0-dev (b45aa469cac7) 
full diff: c04dec1143...b45aa469ca

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
 2025-05-16 19:35:27 +02:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
7e609d491b vendor: github.com/docker/docker c04dec11437f (master, v28.x dev) 
full diff: fd1a78e0a3...c04dec1143

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 17:01:28 +02:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
c108da5d19 Merge pull request #6070 from thaJeztah/enable_importas_linter 
golangci-lint: enable importas linter
 2025-05-16 15:07:31 +02:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
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
Sebastiaan van Stijn
7eaae97e37 cli/command/container: use consistent alias for oci-spec 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 12:34:28 +02:00
Sebastiaan van Stijn
77fbbc38de Merge pull request #6063 from giautm/patch-1 
cli/cli: use `len()` to check frontend ports in the `port` command
 2025-05-16 12:03:15 +02:00
Sebastiaan van Stijn
bca09c7ac4 Merge pull request #6019 from thaJeztah/docker_auth_config_socket 
cli/command/container: --use-api-socket: support DOCKER_AUTH_CONFIG
 2025-05-16 11:57:49 +02:00
Sebastiaan van Stijn
267b5e7982 Merge pull request #6069 from thaJeztah/fluentd_completion 
completion: add completion for "fluentd-write-timeout"
 2025-05-16 11:46:34 +02:00
Sebastiaan van Stijn
535ac074d0 completion: add completion for "fluentd-write-timeout" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 01:27:49 +02:00
Sebastiaan van Stijn
218c7ad958 cli/command/formatter: use ContainerState consts 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 01:13:14 +02:00
Sebastiaan van Stijn
6fd9c57744 cli/command/container: use ContainerState consts 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 01:13:14 +02:00
Sebastiaan van Stijn
21e96eaaa7 cli/command/completion: use ContainerState consts in tests 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 01:13:14 +02:00
Sebastiaan van Stijn
c9d04c770a cli/command/formatter: touch-up godoc for ContainerContext.State() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 01:13:14 +02:00
Sebastiaan van Stijn
d1c76198ba cli/command/formatter: TestContainerPsContext add test for State() 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-16 01:13:13 +02:00
Giau. Tran Minh
c409383dbc cli/cli/port: use len() to check frontends ports 
This ensure the command won't print an empty output if the `frontends` port is nil

Signed-off-by: Giau. Tran Minh <hello@giautm.dev>
 2025-05-13 03:48:15 +07:00
Sebastiaan van Stijn
a09028c837 Merge pull request #6054 from thaJeztah/unify_internal 
move cli/internal/ packages to top-level internal/
 2025-05-12 10:32:41 +02:00
Sebastiaan van Stijn
479c7add4d cli/internal/oauth: move to top-level "internal" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-06 20:09:28 +02:00
Sebastiaan van Stijn
b6059af164 cli/internal/logdetails: move to top-level "internal" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-06 20:04:25 +02:00
Sebastiaan van Stijn
d0d8d1dc72 cli/internal/jsonstream: move to top-level "internal" 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-06 20:04:21 +02:00
Sebastiaan van Stijn
52752f3aa2 inspect: improve (flag) validation 
Produce an error if the `--type` flag was set, but an empty value
was passed.

Before this patch:

    docker inspect --type "" foo
    # json output

    docker inspect --type unknown foo
    "unknown" is not a valid value for --type

With this patch:

    docker inspect --type "" foo
    type is empty: must be one of "config", "container", "image", "network", "node", "plugin", "secret", "service", "task", "volume"

    docker inspect --type unknown foo
    unknown type: "unknown": must be one of "config", "container", "image", "network", "node", "plugin", "secret", "service", "task", "volume"

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-06 15:54:29 +02:00
Sebastiaan van Stijn
8c5aaff57f inspect: update flag description of "--type" flag 
Before this patch:

    docker inspect --help | grep '\-\-type'
          --type string     Return JSON for specified type

With this patch:

    docker inspect --help | grep '\-\-type'
          --type string     Only inspect objects of the given type

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-06 15:45:38 +02:00
Sebastiaan van Stijn
7203340f53 inspect: add shell-completion for "--type" flag 
With this patch:

    docker inspect --type <TAB>
    config     image    node    secret   task
    container  network  plugin  service  volume

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-06 15:43:55 +02:00
Sebastiaan van Stijn
877ea1ce35 inspect: disable default (file) completion 
Before this patch, flags and arguments would complete using filenames
from the current directory;

    docker inspect --type <TAB>
    AUTHORS       CONTRIBUTING.md             docs/             Makefile            SECURITY.md
    ...

    docker inspect <TAB>

With this patch, no completion is provided;

    docker inspect --type <TAB>
    # no results

    docker inspect <TAB>
    # no results

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-06 15:43:55 +02:00
Sebastiaan van Stijn
f61e2bb6f1 inspect: add consts / enum for object-types 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2025-05-06 15:43:55 +02:00
Sebastiaan van Stijn
58d318b990 Merge pull request #6036 from thaJeztah/improve_username_handling 
cli/command/registry: login: improve flag validation
 2025-04-30 19:09:18 +02:00
Matthieu MOREL
54efe295f0 fix(QF1003): Convert if/else-if chain to tagged switch 
Signed-off-by: Matthieu MOREL <matthieu.morel35@gmail.com>
 2025-04-28 18:35:09 +02:00