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 d8e1515350
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 175188d8b0
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 b14f29dfbd
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 cf699ad427
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 37fd1416da
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 670eaa71a0
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 0414a2c1a9
2016-09-06 12:11:34 -07:00
Doug Davis
e3197e1dfa
Merge pull request #26171 from CrimsonGlory/patch-2
...
typo
(cherry picked from commit 6705d68c89
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 368a27a8d8
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 8f424f7774
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 b468df9eac
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 75c36bcc64
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 1a04d7b1e1
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 d4e173fc34
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 384de833c0
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 ad6f5a49d5
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 20869b5650
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 afd54a1a86
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 c1b82df740
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 6221592087
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 644cb53b41
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 ad73e8f169
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 48659599cb
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 91ec7fa811
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 91fdafb79f
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 6072e6bfd2
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 aff33055ac
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 a110512e38
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 602b238136
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 0b2ff0ccde
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 a949a79a58
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 72e7cd75c1
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 7cd88e5ec4
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 88a6a7763b
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 6221592087
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
Charles Smith
5d2e3ad0c9
Merge pull request #26114 from londoncalling/fix-linespacing-swarmtut
...
fixed line spacing in Swarm tutorial bullets
(cherry picked from commit 6221592087
2016-08-29 12:30:00 -07:00
Charles Smith
f1bcb5f10e
Merge pull request #26064 from sfsmithcha/updates_to_v1.12.1_docs
...
author merge: Updates to v1.12.1 docs
2016-08-29 10:02:01 -07:00
Sebastiaan van Stijn
080891bb11
Merge pull request #25902 from MihaiB/docs-link-fragment
...
docs: fix typo in url fragment
(cherry picked from commit ab533a98dc
2016-08-26 16:08:02 -07:00
Sven Dowideit
be94e07b6d
Merge pull request #25901 from yuexiao-wang/add-content
...
Add the content for how services work
(cherry picked from commit abd08f4784
2016-08-26 16:07:35 -07:00
Vincent Demeester
ca9bb6e445
Merge pull request #25899 from yuexiao-wang/fix-overview
...
Optimize description for Feature highlights
(cherry picked from commit d2fa978d4d
2016-08-26 16:06:55 -07:00
Sven Dowideit
7e956837f2
Merge pull request #25835 from decoursin/patch-1
...
Update apparmor error message
(cherry picked from commit e168f0b4ad
2016-08-26 16:06:10 -07:00
Vincent Demeester
069aa4e11a
Merge pull request #25815 from justincormack/capdoc
...
Split list of capabilities into those added by default and those not
(cherry picked from commit d854c4fcc6
2016-08-26 16:05:32 -07:00
Sebastiaan van Stijn
e097320c92
Merge pull request #25792 from lixiaobing10051267/masterSwarmLeave
...
Specify woker node for docker swarm leave command
(cherry picked from commit 90308fd783
2016-08-26 16:04:20 -07:00
Charles Smith
fdb5140893
Merge pull request #25781 from sfsmithcha/add_ingress_guide
...
author merge: add ingress / publish port guide
(cherry picked from commit dee3044336
2016-08-26 16:03:47 -07:00
Vincent Demeester
63fb3077cc
Merge pull request #25775 from ddgenome/entrypoint-env
...
Remove erroneous ENTRYPOINT note
(cherry picked from commit c1bdda0be8
2016-08-26 16:03:07 -07:00
Vincent Demeester
3d4813ffd2
Merge pull request #25751 from yuexiao-wang/clean-docs
...
Remove mess words in installation doc
(cherry picked from commit bbd5396955
2016-08-26 16:01:14 -07:00
Arnaud Porterie
330486c45f
Merge pull request #25750 from talex5/spec
...
Document Healthcheck in image spec
(cherry picked from commit 46cb1f2601
2016-08-26 15:47:08 -07:00
Sebastiaan van Stijn
dc49ed96cb
Merge pull request #25743 from lixiaobing10051267/masterInspect
...
Check the return message of docker service inspect
(cherry picked from commit 6fa69d2d06
2016-08-26 15:44:58 -07:00
