mirror of https://github.com/docker/cli.git
f522905595
Previously, the formatter would ignore the quiet option if a custom format
was passed; this situation was handled in runPs(), where custom formats
would only be applied if the quiet option was not set, but only if the
format was set in the CLI's config.
This patch updates NewContainerFormat() to do the same, even if a `--format`
was passed on the command-line.
This is a change in behavior, so may need some discussion; possible alternatives;
- produce an error if both `--format` and `--quiet` are passed
- print a warning if both are passed (but use the logic from this patch)
Before this patch:
```console
docker ps --format '{{.Image}}'
ubuntu:22.04
alpine
docker ps --format '{{.Image}}' --quiet
ubuntu:22.04
alpine
mkdir -p ~/.docker/
echo '{"psFormat": "{{.Image}}"}' > ~/.docker/config.json
docker ps
ubuntu:22.04
alpine
docker ps --quiet
ubuntu:22.04
alpine
```
With this patch applied:
```console
docker ps --format '{{.Image}}'
ubuntu:22.04
alpine
docker ps --format '{{.Image}}' --quiet
40111f61d5c5
482efdf39fac
mkdir -p ~/.docker/
echo '{"psFormat": "{{.Image}}"}' > ~/.docker/config.json
docker ps
ubuntu:22.04
alpine
docker ps --quiet
40111f61d5c5
482efdf39fac
```
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
|
||
|---|---|---|
| .. | ||
| container-create-localhost-dns-ipv6.golden | ||
| container-create-localhost-dns.golden | ||
| container-create-oom-kill-true-without-memory-limit.golden | ||
| container-create-oom-kill-without-memory-limit.golden | ||
| container-list-format-name-name.golden | ||
| container-list-format-with-arg.golden | ||
| container-list-quiet.golden | ||
| container-list-with-config-format.golden | ||
| container-list-with-format.golden | ||
| container-list-without-format-no-trunc.golden | ||
| container-list-without-format.golden | ||
| container-port-all-ports.golden | ||
| container-port-ipv4.golden | ||
| container-port-ipv6-and-ipv4-443-udp.golden | ||
| container-port-ipv6-and-ipv4.golden | ||
| container-port-ipv6.golden | ||
| utf8.env | ||
| utf16.env | ||
| utf16be.env | ||
| valid.env | ||
| valid.label | ||