toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
830 Commits 3 Branches 295 Tags
5cb6ccf57166068dce1b97386d84b0ea084501cf
Commit Graph
10 Commits
Author SHA1 Message Date
Yong Tang e6e37cf26c Ignore some functions in the Go template when header is rendered 
This fix ignore some functions in the Go template when header is
redendered, so that `--format "{{truncate .ID 1}}"` will still
be able to redener the header correctly.

Additional test cases have been added to the unit test.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 82bf90ffbc
Component: cli
 2017-02-10 19:34:50 -08:00
Yong Tang 2c4a067a4b 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>
Upstream-commit: 9dda1155f3
Component: cli
 2017-02-10 19:34:50 -08:00
Vincent Demeester d81f14e15b Bump go-units 
To include  https://github.com/docker/go-units/pull/23
Fixes a unit test that fails because of it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 6ef0b64945
Component: cli
 2017-02-07 21:58:56 +01:00
Yong Tang 7e9ea5342a Fix several issues with go vet and go fmt 
For some reason, `go vet` and `go fmt` validate does not capture
several issues.

The following was the output of `go vet`:
```
ubuntu@ubuntu:~/docker$ go vet ./... 2>&1 | grep -v ^vendor | grep -v '^exit status 1$'
cli/command/formatter/container_test.go:393: possible formatting directive in Log call
volume/volume_test.go:257: arg mp.RW for printf verb %s of wrong type: bool
```

The following was the output of `go fmt -s`:
```
ubuntu@ubuntu:~/docker$ gofmt -s -l . | grep -v ^vendor
cli/command/stack/list.go
daemon/commit.go
```

Fixed above issues with `go vet` and `go fmt -s`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d691bce8c9
Component: cli
 2016-11-17 06:31:28 -08:00
Brian Goff 2036ffc43b Fix issue with missing fields for ps template 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: d3169abc3b
Component: cli
 2016-11-12 11:23:21 -05:00
Kenfe-Mickael Laventure b2507ea973 Add Networks placeholder to ps --format 
Passing {{.Networks}} to the format parameter will prompt ps to
display all the networks the container is connected to.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
Upstream-commit: 08ac5a3039
Component: cli
 2016-10-20 07:41:56 -07:00
Akihiro Suda f0fd68b09c 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>
Upstream-commit: c11155f0d1
Component: cli
 2016-10-17 08:07:17 +00:00
Daniel Nephin 91cf73d819 Refactor formatter. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: db0952ad22
Component: cli
 2016-09-13 17:58:12 -04:00
Daniel Nephin b924adb986 Fix a test that expects whitespace at the end of the line. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: e2f7387906
Component: cli
 2016-09-08 15:50:14 -04:00
Daniel Nephin 964a552e76 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>
Upstream-commit: 3bd1eb4b76
Component: cli
 2016-09-08 15:46:29 -04:00