9d092e464e
Merge pull request #26241 from YuPengZTE/devNote
...
The first letter of “docker“ is small
Upstream-commit: b14f29dfbd527fd2dbd05e024f760939aba6642c
Component: engine
2016-09-01 20:53:07 +02:00
4fbbab7cfa
The first letter docker is small
...
Upstream-commit: e0e62874bb9bcdaf6418e0d1728c9170527b3c3a
Component: engine
2016-09-01 17:03:01 +08:00
c03a13f697
Merge pull request #26139 from yuexiao-wang/fix-link
...
Modify link for hub and registry
Upstream-commit: ad6f5a49d5f24f8b64def11176b6c8df162d839f
Component: engine
2016-08-31 16:37:50 +01:00
5645fa8e4e
Merge pull request #26182 from yuexiao-wang/add-options
...
Miss the options in some commands
Upstream-commit: ba23bf202adab9f4b8c9dcaffeddfd130674fb15
Component: engine
2016-08-31 14:45:42 +02:00
f9a92ea425
Merge pull request #26192 from lixiaobing10051267/masterPluginInspect
...
make command "docker plugin inspect" complete
Upstream-commit: cf699ad427084076c7ca1ea5fbab78cd77597f2a
Component: engine
2016-08-31 14:42:03 +02:00
a2a77498bf
Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate
...
provide actual command format for docker network create
Upstream-commit: 37fd1416daac0b3963dc812a820b844e9e854e59
Component: engine
2016-08-31 14:41:49 +02:00
d8db57f8be
make command "docker plugin inspect" complete
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: d022bb208461dd1ed9702d8528eed627bc364258
Component: engine
2016-08-31 19:59:23 +08:00
3dedb3cd52
provide actual command format for docker network create
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 18a9600fb15b057af9d3574210b92cb107eefb24
Component: engine
2016-08-31 17:40:13 +08:00
8de2c11691
Update description for docker plugin inspect
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: fdedc38f0c398a81360a90b627493872ef3c8a56
Component: engine
2016-08-31 16:57:44 +08:00
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
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
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
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
1f1420a059
Merge pull request #25214 from allencloud/make-node-ps-default-to-self
...
make node ps default to self in swarm node
Upstream-commit: bb1d70da9ad5804794b7aea77abe59fb9e3ac196
Component: engine
2016-08-30 10:37:20 -04:00
1b0ecb4bfa
Merge pull request #26096 from ohmystack/fix/docs-dockerd
...
Add docs for "--containerd" in dockerd
Upstream-commit: 644cb53b41b49fd750fe9c86e922125ef8156259
Component: engine
2016-08-30 13:36:50 +01:00
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
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
91b527444a
Modify link for hub and registry
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: aedf95e640fe362bbf59516ffa77d8bc1629d507
Component: engine
2016-08-30 16:37:03 +08:00
2aa55a3d95
Fix typo in builder.md
...
Signed-off-by: Kris-Mikael Krister <krismikael@protonmail.com >
Upstream-commit: afcfa77dd80defa996d7d0e073d809ac03493f05
Component: engine
2016-08-30 09:34:10 +02:00
73a8f8cdeb
Add docs for "--containerd" in dockerd
...
Signed-off-by: ohmystack <jiangjun1990@gmail.com >
Upstream-commit: cebb9543e1ae2263905562d1c54e380005d5fe4f
Component: engine
2016-08-30 10:49:39 +08:00
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
97464f18e4
Merge pull request #25990 from vieux/plugin_inspect
...
add -f to plugin inspect
Upstream-commit: bf0077c138a1cf64a42828014c44f8e2b2001703
Component: engine
2016-08-28 17:03:40 +02:00
bdcdcdfff5
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 >
Upstream-commit: b31969ee365f582eb71a7962af9638d79380cd54
Component: engine
2016-08-27 11:54:05 -07:00
1647b02210
Merge pull request #25828 from yuexiao-wang/clean-docs
...
clean up the run.md in reference
Upstream-commit: 2cec66d0f548a274d723dbdfb27d3fafb6df7ec2
Component: engine
2016-08-27 14:50:47 +02:00
67ccfbdecc
Merge pull request #25424 from vieux/enabled
...
replace active by enabled for consistency in plugins
Upstream-commit: ed0dff8f16716b4f6debfc191124e98750dd05bb
Component: engine
2016-08-26 15:22:41 -07:00
d5c2d4c2f5
Merge pull request #23830 from ardnaxelarak/23345_remove_name_from_volume_create
...
remove --name flag from volume create
Upstream-commit: 5168c93419547338b11f5d24d24a2a025ea64524
Component: engine
2016-08-26 21:52:07 +02:00
71cbf188b7
Merge pull request #23614 from icecrime/inspect_services
...
Allow `docker inspect` on all types
Upstream-commit: 6e85b81df2f0a2485b74409813eaa77a2b366685
Component: engine
2016-08-26 18:45:23 +00:00
e357d485dd
add -f to plugin inspect
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: 63a19edcb18b1bc650cc1d6eed78c2c3b376be62
Component: engine
2016-08-25 22:40:05 -07:00
7045275ed8
Update documentation for validation of --ip and ip6.
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 5118dd2992aef27890203b7e8eb62fc5f507d931
Component: engine
2016-08-25 22:11:56 -07:00
0c629aa456
Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm
...
Update docs for `docker create` to include `--rm` flag
Upstream-commit: 91ec7fa811c7476b7c20e3b95a92ea9062d498fa
Component: engine
2016-08-26 09:06:30 -04:00
908de2cc1b
Merge pull request #26029 from WhisperingChaos/25918-permissive-to-privileged
...
Fixes #25918 - Changed --permissive to --privileged.
Upstream-commit: 91fdafb79f1532de33e2e258446d6eab80fd0d53
Component: engine
2016-08-26 12:06:58 +02:00
2056c2799d
Merge pull request #26016 from vdemeester/docs-restart-policy-api-changes
...
Update docker remote api to mention restart policy validation
Upstream-commit: 48ff20c79527096ab8ca9c4be6773e4133afc617
Component: engine
2016-08-26 07:57:53 +02:00
32f7fca331
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 >
Upstream-commit: d7468cff4d672f118cb12a6b169c3098ea620b7e
Component: engine
2016-08-25 22:05:38 -07:00
e44f33953e
replace active by enabled for consistency in plugins
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: cf4e268115911e9e4a4da94dc00b2dc370f86a47
Component: engine
2016-08-25 20:42:49 -07:00
83ee5a765b
Refactor docker inspect to work on all types
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: 3db9f7afce03b1926fd6ba22483ebf0d76d2a1da
Component: engine
2016-08-25 16:29:08 -07:00
346f8a271b
Add option to specify name without --name in volume create
...
Signed-off-by: Kara Alexandra <kalexandra@us.ibm.com >
Upstream-commit: ba3f0bf0e7d4f94eb94023278adcfad4ca8fe9d7
Component: engine
2016-08-25 14:20:06 -07:00
de5170b89d
Fixes #25918 - Changed --permissive to --privileged.
...
Signed-off-by: Rich Moyse <rich@moyse.us >
Upstream-commit: b63ce3305c1dd3aec307bbe3bfe0aead295137cb
Component: engine
2016-08-25 16:49:37 -04:00
d13d215017
Update docker remote api to mention restart policy validation
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: a011a94be7448ee86e28396246de73f646af3a93
Component: engine
2016-08-25 17:03:18 +02:00
c65cef03da
Replace docker command from 'docker daemon' to 'dockerd'
...
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn >
Upstream-commit: 530668cb2262fc89e60a23d9a0f6555498b0171b
Component: engine
2016-08-25 17:04:44 +08:00
9ccbe410f0
Merge pull request #25914 from lixiaobing10051267/masterSwarmJoinManager
...
Remove option "--manager" description for swarm_join.md
Upstream-commit: 7cd88e5ec4fc13e1ded0eb7c565ed299b46c8259
Component: engine
2016-08-22 13:13:21 -07:00
f7b9cff570
Remove option "--manager" description for swarm_join.md
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 344d7f773d10d429b39c8e4e5c7426d4d1998300
Component: engine
2016-08-22 15:42:38 +08:00
36f79775aa
Merge pull request #25719 from eskaaren/master
...
You can force leave swarm
Upstream-commit: daf454d8cd6146ef2cb644614301806ef59c58cc
Component: engine
2016-08-22 09:15:37 +02:00
536db7fdc5
Merge pull request #25775 from ddgenome/entrypoint-env
...
Remove erroneous ENTRYPOINT note
Upstream-commit: c1bdda0be8616f987245cb61a4aedc09c8b5c806
Component: engine
2016-08-22 09:13:54 +02:00
84a03f36d0
docs: fix typo in url fragment
...
I noticed the broken hyperlink in this page:
https://docs.docker.com/engine/reference/builder/
The link should point to `#parser-directives`.
Signed-off-by: Mihai Borobocea <MihaiBorob@gmail.com >
Upstream-commit: 441ecc459f0d08a930ee2d6f4502f24e2217e1fc
Component: engine
2016-08-20 16:19:05 +03:00
e3afe81751
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
Upstream-commit: 09b929083d34836a78ce8ee79b22aea082712072
Component: engine
2016-08-19 22:09:57 +02:00
034eb19e73
Merge pull request #25791 from lixiaobing10051267/masterSwarmJoinToken
...
Modify usage of docker swarm join-token command
Upstream-commit: 80798d28d36936f16fae4dd60af27cd08f54817c
Component: engine
2016-08-19 21:44:42 +02:00
715ba2d5b3
Modify usage of docker swarm join-token command
...
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn >
Upstream-commit: 9123ca546a49f6738a918b89ba7a41963083be54
Component: engine
2016-08-19 09:44:22 +08:00
a603b90d7f
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 >
Upstream-commit: 6c5c34d50d377d1c5318a255240fb2dc9c23cf92
Component: engine
2016-08-18 18:01:25 -07:00
9ab2ca7546
Merge pull request #25708 from timfeirg/master
...
expose RemovalInProgress in StateString #25652
Upstream-commit: 426046db3a5c3c056f02bf3ad5efd1342ff79533
Component: engine
2016-08-18 21:54:48 +02:00
c48cb27659
Merge pull request #25792 from lixiaobing10051267/masterSwarmLeave
...
Specify woker node for docker swarm leave command
Upstream-commit: 90308fd78315412c30da90217ee14515de4fbf8a
Component: engine
2016-08-18 17:08:41 +02:00
