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

5854 commits

Author SHA1 Message Date
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
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
Yong Tang
5118dd2992 Update documentation for validation of --ip and ip6. 
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-08-25 22:11:56 -07:00
Doug Davis
91ec7fa811 Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm 
Update docs for `docker create` to include `--rm` flag
 2016-08-26 09:06:30 -04:00
Antonio Murdaca
91fdafb79f Merge pull request #26029 from WhisperingChaos/25918-permissive-to-privileged 
Fixes #25918 - Changed --permissive to --privileged.
 2016-08-26 12:06:58 +02:00
Vincent Demeester
48ff20c795 Merge pull request #26016 from vdemeester/docs-restart-policy-api-changes 
Update docker remote api to mention restart policy validation
 2016-08-26 07:57:53 +02:00
Vincent Demeester
72e7cd75c1 Merge pull request #25919 from yuexiao-wang/fix-refer 
Remove the redundant words in reference for swarm
 2016-08-26 07:57:07 +02: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
yuexiao-wang
8bcc8ebacc Remove the redundant description 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-26 08:36:34 +08: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
Rich Moyse
b63ce3305c Fixes #25918 - Changed --permissive to --privileged. 
Signed-off-by: Rich Moyse <rich@moyse.us>
 2016-08-25 16:49:37 -04:00
Vincent Demeester
4e4ebbe340 Merge pull request #25896 from raksonibs/fix/docs_step_6 
Email deprecation for step 6 of tutorial
 2016-08-25 21:06:20 +02:00
Oskar Niburski
fbe222a35b Remove Username and Password prompt with login for Step six. 
Signed-off-by: Oskar Niburski <oskarniburski@gmail.com>
 2016-08-25 14:23:45 -04:00
Charles Smith
dee3044336 Merge pull request #25781 from sfsmithcha/add_ingress_guide 
author merge: add ingress / publish port guide
 2016-08-25 10:06:11 -07:00
Charles Smith
465fd93f1c add ingress / publish port guide 
Signed-off-by: Charles Smith <charles.smith@docker.com>
 2016-08-25 09:24:45 -07:00
Alexander Morozov
78771b6225 Merge pull request #25786 from splunk/splunk-logging-driver-raw-format-using-json 
Splunk Logging Driver: formats and verifyconnection
 2016-08-25 09:12:31 -07:00
Vincent Demeester
a011a94be7
Update docker remote api to mention restart policy validation 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-25 17:03:18 +02: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
yuexiao-wang
ad4efd3349 Modify incorrect repository URL 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-24 10:09:33 +08:00
Vincent Demeester
602b238136 Merge pull request #25948 from lixiaobing10051267/masterImages 
get a redis-cli image while using docker pull
 2016-08-23 21:44:26 +02:00
Tõnis Tiigi
0b2ff0ccde Merge pull request #25946 from lixiaobing10051267/masterDockerImages 
Incorrect response field name for command "docker images"
 2016-08-23 11:19:52 -07:00
Vincent Demeester
442da0d8aa Merge pull request #25793 from yuexiao-wang/clean-makefile 
Clean up the Makefile
 2016-08-23 09:43:25 +02:00
lixiaobing10051267
4f7195e3c9 get a redis-cli image using docker pull 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-23 14:44:37 +08:00
lixiaobing10051267
8eae3ceab8 Incorrect response field name for command "docker images" 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-23 14:24:31 +08:00
Doug Davis
a949a79a58 Merge pull request #25931 from fj/patch-1 
Fix minor typo in "Getting Started" documentation
 2016-08-22 21:53:47 -05: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
John Feminella
435bc9d989 Fix minor typo in "Docker Engine runs navitvely" 
Signed-off-by: John Feminella <jxf@jxf.me>
 2016-08-22 15:43:26 -04: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
d2fa978d4d Merge pull request #25899 from yuexiao-wang/fix-overview 
Optimize description for Feature highlights
 2016-08-22 09:17:32 +02:00
Vincent Demeester
daf454d8cd Merge pull request #25719 from eskaaren/master 
You can force leave swarm
 2016-08-22 09:15:37 +02:00
Vincent Demeester
c1bdda0be8 Merge pull request #25775 from ddgenome/entrypoint-env 
Remove erroneous ENTRYPOINT note
 2016-08-22 09:13:54 +02:00
Sven Dowideit
abd08f4784 Merge pull request #25901 from yuexiao-wang/add-content 
Add the content for how services work
 2016-08-22 11:58:30 +10:00
Mihai Borobocea
441ecc459f 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>
 2016-08-20 16:19:05 +03:00
yuexiao-wang
2b0892c02e Add the content for how services work 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-20 17:32:29 +08:00
yuexiao-wang
dde0f86a88 Optimize description for Feature highlights 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-20 16:24:18 +08:00
Oskar Niburski
aa8eb09d83 Email deprecation for step 6 of tutorial 
Signed-off-by: Oskar Niburski <oskarniburski@gmail.com>
 2016-08-19 22:54:12 -04:00
Aaron Lehmann
ad37e30363 Merge pull request #25867 from lixiaobing10051267/masterScheduler 
It is orchestrator not scheduler to create swarm task
 2016-08-19 13:27:12 -07: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
Sebastiaan van Stijn
ec8f20cbf2 Merge pull request #25665 from vdemeester/remove-deprecated-run-flag-from-commit 
Remove -run flag from commit command.
 2016-08-19 15:19:23 +02:00
Vincent Demeester
54ed156879
Remove -run flag from commit command. 
This flag has been deprecated in version below 1.10 so it's safe to
remove now, according to our deprecation policy.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-08-19 13:14:03 +02:00
lixiaobing10051267
cb9dfd391b It is orchestrator not scheduler to create swarm task 
Signed-off-by: lixiaobing10051267 <li.xiaobing1@zte.com.cn>
 2016-08-19 17:02:00 +08: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
yuexiao-wang
bf3d1d1e5a keep the same between rules and PHONY 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-08-19 09:08:39 +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