Commit Graph

42248 Commits

Author SHA1 Message Date
Vincent Demeester eea99cd001 Merge pull request #26236 from yuexiao-wang/remove-h-option
Remove -h option for docker cli
(cherry picked from commit 01fe5639bc46ea6cc2efe7b9333bb4d1abb1894b)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:58 -07:00
Vincent Demeester d95bffff5f Merge pull request #26233 from yuexiao-wang/fix-readme
Fix readme doc for dockerd
(cherry picked from commit 1145c9b0d59dd1210e71799a68addee23884861b)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:46 -07:00
Brian Goff 8a56561528 Merge pull request #26228 from lixiaobing10051267/masterPluginRm
check inconsistant command in docs/reference/commandline
(cherry picked from commit e96c0fafa0465e7d1a3a12fda820c16d0449f814)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:37 -07:00
Charles Smith dc98c76772 Merge pull request #26156 from mstanleyjones/24905_swarm_noun_usage
Sanitize uses of Swarm as a proper and improper noun (Fixes #24905)
(cherry picked from commit 6f0502b89b29a7d23b02363d02104ec531a36e4a)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:29 -07:00
Vincent Demeester 9710d3d9e9 Merge pull request #25896 from raksonibs/fix/docs_step_6
Email deprecation for step 6 of tutorial
(cherry picked from commit 4e4ebbe34040f557775b59d111a8127f1f7df9a2)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:22 -07:00
yuexiao-wang 0d800e9a37 clean up the run.md in reference
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
(cherry picked from commit dd02815a2673794cd94f3225c5517d9f30d09d56)
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-09 14:44:09 -07:00
Sven Dowideit be71b62acf Merge pull request #26431 from mstanleyjones/2016.09.08-engine-docs-updates
2016.09.08 engine docs updates
2016-09-09 21:43:38 +10:00
Vincent Demeester c63cdcd948 Merge pull request #26362 from lixiaobing10051267/masterIfconfig
rectify some response information while execute ifconfig in container
(cherry picked from commit 0ebb18102f376ee42ecc97d159842737ff73568d)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-08 14:34:00 -07:00
Vincent Demeester f1d590c45b Merge pull request #26320 from yongtang/09052016-man-docker-create
Update man page for `docker create` to add `--rm` flag
(cherry picked from commit d7594d23c81ad3de47bba933bb8f9041435a6226)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-08 14:34:00 -07:00
Charles Smith a8c297c254 Merge pull request #26256 from mstanleyjones/rewrite_understanding_docker
Rewrites to Understanding Docker topic for clarity
(cherry picked from commit 426a0af0759798d8e3332b38236ee40df6d14798)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-08 14:34:00 -07:00
Sven Dowideit bf7d335513 Merge pull request #26218 from frosforever/fix_run_reference_typo
Correct typo in run reference docs that use the create command
(cherry picked from commit e73e37f11206a346d2a552c5d133112cd103d562)

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2016-09-08 14:34:00 -07:00
Sven Dowideit 359f8fe426 Merge pull request #26343 from sfsmithcha/2016-09-06-1.12.1-engine-docs-updates
2016 09 06 1.12.1 engine docs updates
2016-09-07 22:15:21 +10:00
Vincent Demeester 11330bf048 Merge pull request #26307 from AkihiroSuda/fix-doc-26291
fix docs about `sudo docker login`
(cherry picked from commit da763602afbb25ea4428e1d608af5ee017a0b94e)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:31:59 -07:00
Vincent Demeester bbf49348e2 Merge pull request #26293 from lixiaobing10051267/masterDockerAttach
fix the wrong option info while specifying the command with the "--help"
(cherry picked from commit d8e151535017b4bb4ee5aa8281f1b9bb7bffa397)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:31:03 -07:00
Vincent Demeester 55f95dd7e8 Merge pull request #26292 from lixiaobing10051267/masterDockerPull
modify output info for docker pull centos
(cherry picked from commit 175188d8b0eb976cceb6c46de439186eec98e40e)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:30:10 -07:00
Vincent Demeester 95bc4519d2 Merge pull request #26241 from YuPengZTE/devNote
The first letter of “docker“ is small
(cherry picked from commit b14f29dfbd527fd2dbd05e024f760939aba6642c)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:28:39 -07:00
Vincent Demeester a42e2a0e42 Merge pull request #26192 from lixiaobing10051267/masterPluginInspect
make command "docker plugin inspect" complete
(cherry picked from commit cf699ad427084076c7ca1ea5fbab78cd77597f2a)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:18:44 -07:00
Vincent Demeester 1e9fb2f18e Merge pull request #26190 from lixiaobing10051267/masterNetworkCreate
provide actual command format for docker network create
(cherry picked from commit 37fd1416daac0b3963dc812a820b844e9e854e59)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:17:10 -07:00
Vincent Demeester 5e4e13e31c Merge pull request #26187 from albers/docs-volume-create-fix
Fix argument order for docker create in tutorial
(cherry picked from commit 670eaa71a0629323327cb5604c44abf14890d4b4)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:15:08 -07:00
Vincent Demeester 748f3ef8e3 Merge pull request #26185 from yuexiao-wang/update-docs
Update description for docker plugin inspect
(cherry picked from commit 0414a2c1a960832cc6d3df8641f23952c3700084)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:11:34 -07:00
Doug Davis e3197e1dfa Merge pull request #26171 from CrimsonGlory/patch-2
typo
(cherry picked from commit 6705d68c8995137f94e2f0958c72e1502e682c88)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:09:20 -07:00
Michael Crosby 01de2e76b4 Merge pull request #26294 from petrsvihlik/updated-windows-mounting-example
Updated Windows mounting example
(cherry picked from commit 368a27a8d80337918d465c8c98100a4e22d9ef1a)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:06:44 -07:00
Sven Dowideit 1a57e1b1f5 Merge pull request #26314 from unclejack/docs_contiv_nfs
docs: mention NFS support for Contiv volume plugin
(cherry picked from commit 8f424f777438169edda354ab82fca9f81c7aab4a)
Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:05:02 -07:00
Sven Dowideit 5c34d579dc Merge pull request #26302 from vdemeester/health_status-in-event-docs
Add health status as action on events documentations
(cherry picked from commit b468df9eac16d73c9b8e4853411df1fafea37d1f)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:04:23 -07:00
Charles Smith 931418603e Merge pull request #26288 from sfsmithcha/add_tls
author merge: addressed @diogomonica ' remark: add how pki works topic
(cherry picked from commit 75c36bcc64a5597919a16a7d43463f7e7c5e1499)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:03:44 -07:00
Vincent Demeester 7e2259bb63 Merge pull request #26271 from AkihiroSuda/fix-service-create-doc
update docs/reference/commandline/service_create.md
(cherry picked from commit 1a04d7b1e13ffe725a5310b55e83ae60b1ab7e55)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:03:07 -07:00
Vincent Demeester b7e9344365 Merge pull request #26258 from mstanleyjones/25625_swarm_init_return_value
Add response to swarm/init example (fixes #25625
(cherry picked from commit d4e173fc347911999458eb82fe4c0fd1b3818218)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 12:02:00 -07:00
Sven Dowideit dc0d2166d5 Merge pull request #26245 from dbdd4us/master
add volumes, networks, nodes and services into label doc
(cherry picked from commit 384de833c0f7e20d6a36b6786d1f2e2e67b90d2f)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:38:02 -07:00
Justin Cormack e773b059d1 Merge pull request #26139 from yuexiao-wang/fix-link
Modify link for hub and registry
(cherry picked from commit ad6f5a49d5f24f8b64def11176b6c8df162d839f)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:37:03 -07:00
Vincent Demeester 934d7b83ef Merge pull request #26135 from kmkr/master
Fix typo in builder.md
(cherry picked from commit 20869b5650bd059cd67969f9774fb4eb78b6dbfd)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:36:27 -07:00
Brian Goff 755addd56f Merge pull request #26127 from lixiaobing10051267/masterDockerDeploy
usage description of docker deploy in md not consistant with go file
(cherry picked from commit afd54a1a8645bde7d5d87efc5567ee0d3c788e78)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:36:03 -07:00
Vincent Demeester 9c2b789caf Merge pull request #26122 from sfsmithcha/updates_for_new_plugin_docs
some fixes to clean up new plugin system docs
(cherry picked from commit c1b82df74042a0290b995283c504b60ac6b4bc95)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:35:22 -07:00
Charles Smith abe05f4a29 Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut
fixed line spacing in Swarm tutorial bullets
(cherry picked from commit 62215920871b8d15a6ffe538baac5abe2b715409)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:34:16 -07:00
Justin Cormack 9bef12dcfd Merge pull request #26096 from ohmystack/fix/docs-dockerd
Add docs for "--containerd" in dockerd
(cherry picked from commit 644cb53b41b49fd750fe9c86e922125ef8156259)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:31:55 -07:00
Vincent Demeester aaa7a58c63 Merge pull request #26080 from sw-double/patch-1
[docs] Fix volume binding in fluentd container example
(cherry picked from commit ad73e8f169ee39ed830bfa385583bddd5741012d)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:31:19 -07:00
Vincent Demeester 49e863f6d0 Merge pull request #26036 from yuexiao-wang/add-gcplog
Add the content for Google Cloud Loging driver in index
(cherry picked from commit 48659599cbb4c896e9597e50ae16c087d9dd5ac9)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:30:46 -07:00
Doug Davis 44180a48e9 Merge pull request #26030 from yongtang/08252016-doc-docker-create-rm
Update docs for `docker create` to include `--rm` flag
(cherry picked from commit 91ec7fa811c7476b7c20e3b95a92ea9062d498fa)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:29:55 -07:00
Antonio Murdaca 8f0254da41 Merge pull request #26029 from WhisperingChaos/25918-permissive-to-privileged
Fixes #25918 - Changed --permissive to --privileged.
(cherry picked from commit 91fdafb79f1532de33e2e258446d6eab80fd0d53)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:26:13 -07:00
Charles Smith 2aa780abe4 Merge pull request #26028 from londoncalling/docs-pinata-for-swarm
Clarify how to use d4mac, d4win with swarm mode
(cherry picked from commit 6072e6bfd20598f4e9cb28d32c09bfddec6df76c)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:11:13 -07:00
Vincent Demeester af9378f713 Merge pull request #25996 from yuexiao-wang/fix-docker-daemon
Replace docker command from 'docker daemon' to 'dockerd'
(cherry picked from commit aff33055ac138e09ef693c8d07ea005cde55e025)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:06:57 -07:00
Justin Cormack a3098657c3 Merge pull request #25963 from yuexiao-wang/fix-repo
Modify incorrect repository URL
(cherry picked from commit a110512e38a14e938096fe18b345e8f920605b9f)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:06:21 -07:00
Vincent Demeester 6e9dd212b9 Merge pull request #25948 from lixiaobing10051267/masterImages
get a redis-cli image while using docker pull
(cherry picked from commit 602b2381360cf59fffe46b64bb4bdfa180639c44)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:05:44 -07:00
Tõnis Tiigi 9234cc38e2 Merge pull request #25946 from lixiaobing10051267/masterDockerImages
Incorrect response field name for command "docker images"
(cherry picked from commit 0b2ff0ccdef3327e52699941b2ab888f7fbecb1e)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:05:22 -07:00
Doug Davis d649ae0370 Merge pull request #25931 from fj/patch-1
Fix minor typo in "Getting Started" documentation
(cherry picked from commit a949a79a5899df2b57c0ff3e6a3e9aa432db248c)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:04:23 -07:00
Vincent Demeester af2a9ba322 Merge pull request #25919 from yuexiao-wang/fix-refer
Remove the redundant words in reference for swarm
(cherry picked from commit 72e7cd75c1f7a636b48774c3ba189cc8fd510138)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:03:48 -07:00
Aaron Lehmann 72f1556f62 Merge pull request #25914 from lixiaobing10051267/masterSwarmJoinManager
Remove option "--manager" description for swarm_join.md
(cherry picked from commit 7cd88e5ec4fc13e1ded0eb7c565ed299b46c8259)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:03:16 -07:00
Sebastiaan van Stijn 909f9f5ea8 Merge pull request #25726 from vieux/new_plugin_system_doc
adding some documentation about the new plugin system
(cherry picked from commit 88a6a7763b789a35fff9df4e52e48ca99afd3c08)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-09-06 11:02:11 -07:00
Sven Dowideit e98eafcc3c Merge pull request #26168 from sfsmithcha/fix_swarm_tutorial_note
Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut
2016-08-31 12:23:09 +10:00
Charles Smith 69d3aaa2e2 Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut
fixed line spacing in Swarm tutorial bullets
(cherry picked from commit 62215920871b8d15a6ffe538baac5abe2b715409)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-30 15:12:02 -07:00
Charles Smith 1f563dd224 Merge pull request #26117 from sfsmithcha/2016_08_29_engine_docs_updates
author merge: Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut
2016-08-30 11:02:05 -07:00