Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
829 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

7 Commits

Author SHA1 Message Date
Yong Tang 9dda1155f3 Allow `--format` to use different delim in `table` format 
This fix is an attempt to address
https://github.com/docker/docker/pull/28213#issuecomment-273840405

Currently when specify table format with table `--format "table {{.ID}}..."`,
the delimiter in the header section of the table is always `"\t"`.
That is actually different from the content of the table as the delimiter
could be anything (or even contatenated with `.`, for example):
```
$ docker service ps web --format 'table {{.Name}}.{{.ID}}' --no-trunc

NAME                ID
web.1.inyhxhvjcijl0hdbu8lgrwwh7
 \_ web.1.p9m4kx2srjqmfms4igam0uqlb
```

This fix is an attampt to address the skewness of the table when delimiter
is not `"\t"`.

The basic idea is that, when header consists of `table` key, the header section
will be redendered the same way as content section. A map mapping each
placeholder name to the HEADER entry name is used for the context of the header.

Unit tests have been updated and added to cover the changes.

This fix is related to #28313.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-02-10 19:34:50 -08:00
Justin Cormack 3ab6e03ba3 Merge pull request #26519 from AkihiroSuda/fix-cli-command-formatter-json-support 
Fix broken JSON support in cli/command/formatter
 2016-10-17 22:44:04 +01:00
Vincent Demeester 6c3c3a87ba Revert docker volume column name to VOLUME_NAME 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-10-17 20:03:31 +02:00
Akihiro Suda c11155f0d1 Fix broken JSON support in cli/command/formatter 
How to test:

    $ docker ps --format '{{json .}}'
    $ docker network ls --format '{{json .}}'
    $ docker volume ls --format '{{json .}}'

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-10-17 08:07:17 +00:00
Daniel Nephin 2f8c4333fe Fix testcases that expect trailing whitespace 
and broken integration tests based of nil pointers

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-13 17:58:12 -04:00
Daniel Nephin db0952ad22 Refactor formatter. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-13 17:58:12 -04:00
Daniel Nephin 3bd1eb4b76 Move api/client -> cli/command 
Using
  gomvpkg
     -from github.com/docker/docker/api/client
     -to github.com/docker/docker/cli/command
     -vcs_mv_cmd 'git mv {{.Src}} {{.Dst}}'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-09-08 15:46:29 -04:00