p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
27,378 Commits 2 Branches 295 Tags
7330d7eef706b671f0b1107c10b4e8a398203eea
Commit Graph

2337 Commits

Author SHA1 Message Date
John Howard
92d37247b3 Windows: OCI process struct convergence 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 53774423ff0db50cb0934e7b1e5ce507363e8147
Component: engine
 2016-09-19 10:34:31 -07:00
John Howard
5049c43226 Merge pull request #25737 from Microsoft/jjh-statistics 
Windows: Add support for docker stats
Upstream-commit: 4a0419f536ce3a7b1eade67440cfc84d6e486caf
Component: engine
 2016-09-17 09:31:24 -07:00
Vincent Demeester
66c468a968 Merge pull request #26606 from dnephin/move_errors 
Move errors package to api/errors
Upstream-commit: 5d7b725071a7cc7c994f2f7f6a29352790f5096a
Component: engine
 2016-09-17 16:00:38 +02:00
Drew Erny
0529a1ae57 Added comments to PortConfig for greater clarity 
I always forget which one is which. Now, I can't forget. This is
probably in the docs somewhere but now it's handy at a glance.

Signed-off-by: Drew Erny <drew.erny@docker.com>
Upstream-commit: 55454752f825a5ec033ca072350a77a928afd6ac
Component: engine
 2016-09-16 14:47:35 -07:00
John Howard
7342ae40e2 Windows: stats support 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 340e5233b2fb95981ddea610c1667134ed3b2376
Component: engine
 2016-09-16 11:56:15 -07:00
Daniel Nephin
e90292dd20 Use apiError in server version middleware. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bcb0405239e0c820516b05ccc2bb7e8d4a1599f9
Component: engine
 2016-09-16 12:27:14 -04:00
Daniel Nephin
d47b1c8a71 Move errors/ to api/errors 
Using:
        gomvpkg -from github.com/docker/docker/errors
                -to github.com/docker/docker/api/errors
                -vcs_mv_cmd "git mv {{.Src}} {{.Dst}}"

Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: c452e1bfe6b19d44bf2ed2a1eb8aef7e23d6bafb
Component: engine
 2016-09-16 12:27:13 -04:00
boucher
982e83123e Fix the clashing route syntax for checkpoint/container delete. 
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: 0dfbf960d72fc3f7deec02cc3f36385361216794
Component: engine
 2016-09-08 21:31:56 -04:00
boucher
7bef93723c Initial implementation of containerd Checkpoint API. 
Signed-off-by: boucher <rboucher@gmail.com>
Upstream-commit: d8fef66b03c1ea8715470690efbd950033f7f628
Component: engine
 2016-09-08 21:31:52 -04:00
Daniel Nephin
d8acc366ce 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: 0640a14b4fcba3715f7cc3bc9444f3c7f4827edd
Component: engine
 2016-09-08 15:46:29 -04:00
Alexander Morozov
0b990a4b09 Merge pull request #26107 from dnephin/client_cleanup 
Shrink the DockerCLI type
Upstream-commit: d959e7fac4345762d26083a5d694871377f6dc75
Component: engine
 2016-09-08 12:18:46 -07:00
Michael Crosby
574f281ca0 Merge pull request #26224 from q384566678/test-zhou 
Modify rename function use tips
Upstream-commit: 061cc417591217c4bcf735267c2de18f2a8189c0
Component: engine
 2016-09-08 11:22:21 -07:00
Daniel Nephin
14da2ebf2c Move holdHijackConnection to the container package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 6af6a3a5383642d2d7c3784f0f4e562dc324819a
Component: engine
 2016-09-08 12:58:06 -04:00
Daniel Nephin
f861cad6dd Move container util methods to the container package. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: 31d8c27e704c9dd06ba3a0cccb7427054d9e6ccd
Component: engine
 2016-09-08 12:38:52 -04:00
Daniel Nephin
bb1ed52ac8 Extract input stream into a new type. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: bec81075bf1ae07abcbf3f984922dedb10458cb2
Component: engine
 2016-09-08 12:34:55 -04:00
Daniel Nephin
e0295afbc4 Extract stream output handling to a new type. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
Upstream-commit: a0ab33124a52853af611254cd73838e3d4407f51
Component: engine
 2016-09-08 12:33:41 -04:00
Jana Radhakrishnan
f0d30a4b26 Add support for docker run in swarm mode overlay 
This PR adds support for running regular containers to be connected to
swarm mode multi-host network so that:
    - containers connected to the same network across the cluster can
      discover and connect to each other.
    - Get access to services(and their associated loadbalancers)
      connected to the same network

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 99a98ccc14a9427be47c8006e130750710db0a16
Component: engine
 2016-09-07 21:20:41 -07:00
Michael Crosby
60a22c207c Move engine-api client package 
This moves the engine-api client package to `/docker/docker/client`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 7c36a1af031b510cd990cf488ee5998a3efb450f
Component: engine
 2016-09-07 11:05:58 -07:00
Michael Crosby
45ddc4bfcb Add engine-api types to docker 
This moves the types for the `engine-api` repo to the existing types
package.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 91e197d614547f0202e6ae9b8a24d88ee131d950
Component: engine
 2016-09-07 11:05:58 -07:00
Aaron Lehmann
19d0c0f4d5 Merge pull request #23100 from runcom/fix-stores 
support legacy registries in exernal stores
Upstream-commit: 86124ca04b4b0ff4096ca95626e7864692edeadf
Component: engine
 2016-09-07 09:44:41 -07:00
Brian Goff
03938c05b0 Merge pull request #26115 from yongtang/08292016-info-registry-mirrors 
Add registry mirrors information in the output of `docker info`
Upstream-commit: 6168e98a13ee4d226fe96c5afbe672065ddf2c8e
Component: engine
 2016-09-07 11:37:36 -04:00
Daniel Nephin
a8af3835c4 Merge pull request #26269 from yuexiao-wang/remove-option 
Remove the option for the command service rm
Upstream-commit: 20607e2cc20662453226938e4fe0d7ca40fc6ae7
Component: engine
 2016-09-07 11:31:11 -04:00
Antonio Murdaca
4eb86a788b support legacy registries in exernal stores 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 67d752ac55869eab42280947ad37ff5e1468d458
Component: engine
 2016-09-07 09:45:42 +02:00
Stephen J Day
7321b93433 api/client/node: correct ordering in context argument 
Signed-off-by: Stephen J Day <stephen.day@docker.com>
Upstream-commit: 084ff6dc6da4458e8ca0e4fffa9d133a5d39ee92
Component: engine
 2016-09-06 17:04:43 -07:00
Vincent Demeester
392f4993c4 Merge pull request #26282 from mstanleyjones/26280_fix_pretty_print 
`docker node inspect <node> --pretty`  needs an extra newline at the end
Upstream-commit: 5c6b54c278e9639e7b21908315ff986ac812d4fe
Component: engine
 2016-09-06 16:04:55 +02:00
allencloud
bf0c3d33a0 correct docker volume ls subcommand description 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 2087f94df57473f553972236c9a5e63fb694a664
Component: engine
 2016-09-06 17:18:41 +08:00
Yong Tang
c53f181a9b Fix incorrect help output in docker network ls 
As is raised in 26312, in `docker network ls`, the help output was
mistaken to `volume names`:
```
-q, --quiet Only display volume names
```

This fix changes the help output to:
```
-q, --quiet Only display network IDs
```

This fix also updates the documentation in:
`docs/reference/commandline/network_ls.md`

This fix fixes 26312.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: b9e46235fadc6b390e2c04c44b6a865e4ea97cb8
Component: engine
 2016-09-05 08:24:22 -07:00
Brian Goff
96c3a68eb8 Merge pull request #26279 from miaoyq/delete-a-useless-funtion 
delete a function which isn't used in the project
Upstream-commit: 93a8b5c42be79ae2ed5c956dfbb39da8e1f6d78b
Component: engine
 2016-09-03 13:36:37 -04:00
Vincent Demeester
637e45cd56 Merge pull request #26290 from tonistiigi/govet17 
Fix govet for go1.7
Upstream-commit: c73fae2352788323476759f4199b034b7ffc54dd
Component: engine
 2016-09-03 19:27:19 +02:00
Tonis Tiigi
833a33ebb8 Fix govet for go1.7 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: 7a8c7b47cffa8485b03db715f78c087b01ae5dfa
Component: engine
 2016-09-02 19:07:54 -07:00
Misty Stanley-Jones
7dd0d58809 'docker node inspect <node> --pretty' needs an extra newline at the end 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Upstream-commit: 341489f1500873a6aa51998f49c1da7f7fd8eb5a
Component: engine
 2016-09-02 11:15:00 -07:00
Yanqiang Miao
d354343b40 delete a function which isn't used in the project 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
Upstream-commit: 81849600fc1d7335f1ddc3ca5aa1cb5625bd2d30
Component: engine
 2016-09-02 22:54:19 +08:00
yuexiao-wang
64ea42838d Remove the option for the command service rm 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: 1016cbb64243ca8adc9444779e6e4717a4541ef7
Component: engine
 2016-09-02 17:23:59 +08:00
Yong Tang
e2707394d0 Fix issue in docker import -c with quoted flags 
This fix tries to address the issue in 26173 where `docker import -c`
with quoted flags returns an error.

The issue was that in `api/client/image/import.go` the flag
`--change/-c` was handled by `StringSliceVarP` which does not handle
the quote well.

The similiar issue was enountered for 23309 (`docker commit`).

This fix takes the same approach as 23309 where `StringSliceVarP`
was replaced with `VarP` and `opts.ListOpts`.

An integration test has been added to cover the changes.

This fix fixes 26173.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: a79a27412d721a042ae96b411ab1b5b926a7d28a
Component: engine
 2016-09-01 16:28:22 -07:00
Justin Cormack
a03ebc79ee Merge pull request #26200 from runcom/engine-api-vendor 
vendor docker/engine-api@f9cef59044
Upstream-commit: 8ccac1ad4de898583113d036810da3a35a9be906
Component: engine
 2016-09-01 10:51:34 +01:00
zhouhao
c222d18573 Modify rename function usage 
Signed-off-by: zhouhao <zhouhao@cn.fujitsu.com>
Upstream-commit: 61c8b3380fe35fbd021a3efc1f180c1636d08a27
Component: engine
 2016-09-01 14:48:02 +08:00
Antonio Murdaca
1965814a4e vendor docker/engine-api@f9cef59044 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 8f7a8c75ae251f1260299892c5de7c83224b110e
Component: engine
 2016-08-31 22:39:13 +02:00
Vincent Demeester
6366d986f8 Merge pull request #26191 from runcom/fix-unknownflag-exit-code 
api: client: container: update: fix help text
Upstream-commit: 6ac30e57d0c3060478a04352b19e4188a8d0cc3e
Component: engine
 2016-08-31 21:15:51 +02:00
Antonio Murdaca
7cfdadb657 api: client: container: update: fix help text 
Before:

$ docker update --cpu-period
Status: flag needs an argument: --cpu-period
See 'docker update --help'., Code: 125

After:

$ docker update --cpu-period
flag needs an argument: --cpu-period
See 'docker update --help'.

Also remove flagErrorFunc function which isn't needed anymore.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: c2c2617534685917c4a1c2367af861c598cc050a
Component: engine
 2016-08-31 12:46:40 +02:00
yuexiao-wang
8af8bf399a Miss the options in some commands 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: b8af6b579b4f5f3799957165f0a1631b4b68faa4
Component: engine
 2016-08-31 14:18:41 +08:00
Arnaud Porterie
23c1ddf73c Merge pull request #26140 from yuexiao-wang/modify-usage 
Modify options for the command plugin install
Upstream-commit: ec82819cc9c652908fd74fb2082900dfa0468bcc
Component: engine
 2016-08-31 00:04:45 +00:00
Vincent Demeester
58d79a8716 Merge pull request #26145 from allencloud/update-command-description 
update command description
Upstream-commit: 19aee549269ab7e7a025aaf7b820577f52dc4443
Component: engine
 2016-08-30 22:16:57 +02:00
Yong Tang
384bd6a415 Add registry mirrors information in the output of docker info 
This fix tries to add the registry mirrors information in the output
of `docker info`.

In our active deployment, we use registry mirrors to help speeding
up the `docker pull`. In the current output of `docker info`,
registry mirrors is not present though it is available in `/info` API.

I think it makes sense to add the registry mirrors to `docker info`,
similiar to insecure registries.

This fix adds the registry mirrors to the output of `docker info`:
```
Registry Mirrors:
 https://192.168.1.2/
 http://registry.mirror.com:5000/
```

An integration test has been added to cover the changes.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 0f6acff796f7b3c9b981dbcae6db6f255ee2055c
Component: engine
 2016-08-30 09:05:24 -07:00
Anusha Ragunathan
44b8f27e57 Merge pull request #26134 from lixiaobing10051267/masterDockerExec 
Modify use of docker exec command in exec.go
Upstream-commit: 5bd14f88cdb38978c28b015ddc0ce343b72b408b
Component: engine
 2016-08-30 08:27:02 -07:00
allencloud
feabcf715e update command description 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 123ce0e4be7c2743c5dee0a9aff84cd2c23758e0
Component: engine
 2016-08-30 23:07:42 +08:00
lixiaobing10051267
0ecc84d963 Modify usage of docker exec command in exec.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>

Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
Upstream-commit: 26bd3e8b11dd9ef9a8226341ed04cbc8a58776cc
Component: engine
 2016-08-30 22:14:55 +08:00
yuexiao-wang
558afd07bb Modify options for the command plugin install 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
Upstream-commit: d08886618eac804e879cc2953a3a07863e90e5e6
Component: engine
 2016-08-30 18:45:06 +08:00
allencloud
37e3bbaff0 make node ps default to self in swarm node 
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: b13f5dfd130a69b0eb655d349b7839f12a9384ed
Component: engine
 2016-08-30 17:34:16 +08:00
John Howard
75a4cd19f2 Fix golint errors in api 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c8ce0856b752cecb2f2a2149b79e6e96a63f03dc
Component: engine
 2016-08-29 13:36:16 -07:00
Brian Goff
edf9053174 Merge pull request #25317 from yongtang/25304-docker-service-create-group 
Support `--group` in `docker service create`
Upstream-commit: d09c04a667fc2895650b0c2bb25e28fb226e3f31
Component: engine
 2016-08-29 10:27:31 -04:00