0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
26969 commits 14 branches 412 tags 338 MiB
Commit graph

673 commits

Author SHA1 Message Date
yuexiao-wang
8ad8245ee3 Remove -h option for docker cli 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-09-02 11:46:49 +08:00
Vincent Demeester
ba23bf202a Merge pull request #26182 from yuexiao-wang/add-options 
Miss the options in some commands
 2016-08-31 14:45:42 +02:00
Vincent Demeester
cf699ad427 Merge pull request #26192 from lixiaobing10051267/masterPluginInspect 
make command "docker plugin inspect" complete
 2016-08-31 14:42:03 +02:00
Vincent Demeester
37fd1416da Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate 
provide actual command format for docker network create
 2016-08-31 14:41:49 +02:00
lixiaobing10051267
d022bb2084 make command "docker plugin inspect" complete 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-31 19:59:23 +08:00
lixiaobing10051267
18a9600fb1 provide actual command format for docker network create 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-31 17:40:13 +08:00
yuexiao-wang
fdedc38f0c Update description for docker plugin inspect 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-31 16:57:44 +08:00
yuexiao-wang
b8af6b579b Miss the options in some commands 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-31 14:18:41 +08:00
Arnaud Porterie
ec82819cc9 Merge pull request #26140 from yuexiao-wang/modify-usage 
Modify options for the command plugin install
 2016-08-31 00:04:45 +00:00
Vincent Demeester
19aee54926 Merge pull request #26145 from allencloud/update-command-description 
update command description
 2016-08-30 22:16:57 +02:00
allencloud
123ce0e4be update command description 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-30 23:07:42 +08:00
Daniel Nephin
bb1d70da9a Merge pull request #25214 from allencloud/make-node-ps-default-to-self 
make node ps default to self in swarm node
 2016-08-30 10:37:20 -04:00
Justin Cormack
644cb53b41 Merge pull request #26096 from ohmystack/fix/docs-dockerd 
Add docs for "--containerd" in dockerd
 2016-08-30 13:36:50 +01:00
yuexiao-wang
d08886618e Modify options for the command plugin install 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-30 18:45:06 +08:00
allencloud
b13f5dfd13 make node ps default to self in swarm node 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-08-30 17:34:16 +08:00
ohmystack
cebb9543e1 Add docs for "--containerd" in dockerd 
Signed-off-by: ohmystack <jiangjun1990@gmail.com>
 2016-08-30 10:49:39 +08:00
Brian Goff
d09c04a667 Merge pull request #25317 from yongtang/25304-docker-service-create-group 
Support `--group` in `docker service create`
 2016-08-29 10:27:31 -04:00
Yong Tang
b31969ee36 Support --group-add and --group-rm in docker service create/update 
This fix tries to address the issue raised in 25304 to support
`--group-add` and `--group-rm` in `docker service create`.

This fix adds `--group-add` to `docker service create` and `docker service update`,
adds `--group-rm` to `docker service update`.

This fix updates docs for `docker service create` and `docker service update`:
1. Add `--group-add` to `docker service create` and `docker service update`
2. Add `--group-rm` to `docker service update`

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-27 11:54:05 -07:00
Tibor Vass
ed0dff8f16 Merge pull request #25424 from vieux/enabled 
replace active by enabled for consistency in plugins
 2016-08-26 15:22:41 -07:00
Vincent Demeester
5168c93419 Merge pull request #23830 from ardnaxelarak/23345_remove_name_from_volume_create 
remove --name flag from volume create
 2016-08-26 21:52:07 +02:00
Arnaud Porterie
6e85b81df2 Merge pull request #23614 from icecrime/inspect_services 
Allow `docker inspect` on all types
 2016-08-26 18:45:23 +00:00
Victor Vieux
63a19edcb1 add -f to plugin inspect 
Signed-off-by: Victor Vieux <vieux@docker.com>

Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-08-25 22:40:05 -07:00
Yong Tang
d7468cff4d Update docs for docker create to include --rm flag 
Since 20848 has been merged and both `docker create` and
`docker run` share the same `runconfig` parser, now both
`docker run` and `docker create` allow to specify the
`--rm` flag. However, docs for `docker create` has not
been udpated yet.

This fix updates docs for `docker create` so that `--rm`
flag has been included.

This fix is related to 20848 and 25577.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-25 22:05:38 -07:00
Victor Vieux
cf4e268115 replace active by enabled for consistency in plugins 
Signed-off-by: Victor Vieux <vieux@docker.com>
 2016-08-25 20:42:49 -07:00
Arnaud Porterie (icecrime)
3db9f7afce
Refactor docker inspect to work on all types 
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
 2016-08-25 16:29:08 -07:00
Kara Alexandra
ba3f0bf0e7 Add option to specify name without --name in volume create 
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com>
 2016-08-25 14:20:06 -07:00
yuexiao-wang
530668cb22 Replace docker command from 'docker daemon' to 'dockerd' 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-25 17:04:44 +08:00
Aaron Lehmann
7cd88e5ec4 Merge pull request #25914 from lixiaobing10051267/masterSwarmJoinManager 
Remove option "--manager" description for swarm_join.md
 2016-08-22 13:13:21 -07:00
lixiaobing10051267
344d7f773d Remove option "--manager" description for swarm_join.md 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-22 15:42:38 +08:00
Vincent Demeester
09b929083d Merge pull request #23436 from yongtang/23367-out-of-band-volume-driver-deletion 
Add `--force` in `docker volume rm` to fix out-of-band volume driver deletion
 2016-08-19 22:09:57 +02:00
Sebastiaan van Stijn
80798d28d3 Merge pull request #25791 from lixiaobing10051267/masterSwarmJoinToken 
Modify usage of docker swarm join-token command
 2016-08-19 21:44:42 +02:00
lixiaobing10051267
9123ca546a Modify usage of docker swarm join-token command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-19 09:44:22 +08:00
Yong Tang
6c5c34d50d Add --force in docker volume rm to fix out-of-band volume driver deletion 
This fix tries to address the issue in raised #23367 where an out-of-band
volume driver deletion leaves some data in docker. This prevent the
reuse of deleted volume names (by out-of-band volume driver like flocker).

This fix adds a `--force` field in `docker volume rm` to forcefully purge
the data of the volume that has already been deleted.

Related documentations have been updated.

This fix is tested manually with flocker, as is specified in #23367.
An integration test has also been added for the scenario described.

This fix fixes #23367.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-18 18:01:25 -07:00
Vincent Demeester
426046db3a Merge pull request #25708 from timfeirg/master 
expose RemovalInProgress in StateString #25652
 2016-08-18 21:54:48 +02:00
Sebastiaan van Stijn
90308fd783 Merge pull request #25792 from lixiaobing10051267/masterSwarmLeave 
Specify woker node for docker swarm leave command
 2016-08-18 17:08:41 +02:00
timfeirg
37466cc8c8 expose RemovalInProgress in StateString #25652 
Signed-off-by: timfeirg <kkcocogogo@gmail.com>
 2016-08-18 11:25:27 +08:00
lixiaobing10051267
fd660e21bf Specify woker node for docker swarm leave command 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-18 09:35:11 +08:00
Michael Crosby
041e5a21dc Replace old oci specs import with runtime-specs 
Fixes #25804

The upstream repo changed the import paths.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-08-17 09:38:34 -07:00
Sebastiaan van Stijn
a5ba032c74 Add missing docs about binary remote contexts 
This feature was added in docker 1.8, through
7491f9a9c1.

However, the API docs ended up in the wrong
API version (1.19 instead of 1.20), so were
never included in future API docs.

Also, the CLI docs got lost during splitting
up the cli.md docs into separate files;
561bfb268d

This moves the API docs to the correct
versions, and restores the CLI documentation.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-17 16:15:59 +02:00
Tõnis Tiigi
9a3e7d9e34 Merge pull request #25701 from WeiZhang555/update-conflict-rm-restart 
Forbid update restart policy of container with AutoRemove flag
 2016-08-16 10:37:45 -07:00
Michael Crosby
0c8b0faef8 Merge pull request #25337 from jhorwit2/jah/25332 
Add --no-trunc to service/node/stack ps output
 2016-08-16 09:25:45 -07:00
Josh Horwitz
204c4d39d3 Add --no-trunc to service/node/stack ps output 
Signed-off-by: Josh Horwitz <horwitzja@gmail.com>
 2016-08-16 10:19:11 -04:00
Sebastiaan van Stijn
dcdf2b404e Merge pull request #25720 from thaJeztah/add-missing-label-filter-docs 
Add missing docs for volume ls filter=label
 2016-08-16 13:50:56 +02:00
Zhang Wei
4754c64ab5 Forbid update restart policy of container with AutoRemove flag 
"--restart" and "--rm" are conflict options, if a container is started
with AutoRemove flag, we should forbid the update action for its Restart
Policy.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-08-16 15:36:13 +08:00
Akihiro Suda
dc38c9a047 add --format flag to docker info 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2016-08-16 04:03:52 +00:00
Sebastiaan van Stijn
5171b83495
Add missing docs for volume ls filter=label 
This filter option was added in be045ee2da,
but didn't update the documentation and
man pages.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-15 17:42:16 +02:00
Sebastiaan van Stijn
8d5818a693
Restore missing ps example for killed containers 
This example was added in b0b2f979c7,
but got lost during splitting up the cli.md docs into separate files;
561bfb268d

This restores the missing example.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-08-15 13:41:18 +02:00
Charles Smith
cc5debcb2e add overlay networking security model node 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-12 13:17:24 -07:00
David Lechner
43c8cc7bb4 Move export from image commands to container commands 
The export command operates on containers, not images, so it should be listed under the container commands, not the image commands.

Signed-off-by: David Lechner <david@lechnology.com>
 2016-08-12 12:15:32 -05:00
Sebastiaan van Stijn
d8240c8e27 Merge pull request #25564 from coolljt0725/fix_inspect_network 
Fix inspect network show gateway with mask
 2016-08-12 11:11:09 +02:00