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
Sebastiaan van Stijn
21e168053f
Merge pull request #25709 from thaJeztah/fix-missing-docs-for-binary-remote-context
...
Add missing docs about binary remote contexts
(cherry picked from commit b4abe38d43
2016-08-26 15:44:11 -07:00
Sebastiaan van Stijn
88bd4cb0ea
Merge pull request #25704 from thaJeztah/cleanup-api-markdown
...
Cleanup API docs Markdown formatting and wording
(cherry picked from commit 45cb33e65c
2016-08-26 15:41:54 -07:00
Tibor Vass
23cf638307
Bump VERSION to v1.12.1
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-08-17 21:40:58 -07:00
Tibor Vass
3e4c33365f
Merge pull request #25830 from tiborvass/cherry-pick-25825
...
[1.12] Fix volume not working after daemon restart
2016-08-17 21:05:32 -07:00
Brian Goff
e8ed523480
Fix volume not working after daemon restart
...
When the daemon is started, it looks at all the volumes and checks to
see if any of them have mount options persisted to disk, and loads them
from disk if it does.
In some cases a volume will be created with an empty map causing the
options file to be persisted and volume options set to a non-nil value
on daemon restart... this causes problems later when the driver checks
for a non-nil value to determine if it should try and mount with the
persisted volume options.
Ensures 2 things:
1. Instead of only checking nilness for the opts map, use `len` to make
sure it is not an empty map, which we don't really need to persit.
2. An empty (or nulled) opts.json will not inadvertnatly set volume
options on daemon restart.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
(cherry picked from commit 246d1eb58e
2016-08-17 20:17:09 -07:00
Tibor Vass
5d29b79241
Merge pull request #25780 from thaJeztah/1.12.1-docs-cherry-picks
...
1.12.1 docs cherry picks
2016-08-17 20:01:46 -07:00
Tibor Vass
6e7b8f41ca
Merge pull request #25787 from tiborvass/cherry-pick-23790
...
[1.12] Skip always pulling images on integration tests
2016-08-17 20:00:56 -07:00
Tibor Vass
bd8d47e028
Merge pull request #25811 from aaronlehmann/swarm-changelog
...
Add swarm section to 1.12.1 changelog
2016-08-17 17:14:55 -07:00
Eivin Giske Skaaren
c745f4db98
"Annotations" not a parameter
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
(cherry picked from commit 69e481af4e
2016-08-17 23:22:00 +02:00
Eivin Giske Skaaren
b313230fa8
Capital D in "ID" returned when creating service
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
(cherry picked from commit 9eb2ec799e
2016-08-17 23:22:00 +02:00
Eivin Giske Skaaren
a193f2995e
Add doc for inspect swarm
...
Signed-off-by: Eivin Giske Skaaren <eivin@sysmystic.com>
(cherry picked from commit c59bc53727
2016-08-17 23:22:00 +02:00
Sebastiaan van Stijn
0f63ddb03d
Fix capitalization
...
Signed-off-by: YuPengZTE <yu.peng36@zte.com.cn>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 75e60fbe09
2016-08-17 23:22:00 +02:00
Sebastiaan van Stijn
2875711fe7
Restore missing ps example for killed containers
...
This example was added in b0b2f979c7561bfb268d8d5818a693
2016-08-17 23:21:59 +02:00
Sebastiaan van Stijn
e24421a6ef
Move sysctls to correct API version
...
Commit 067b510dfc7cdd693d5d
2016-08-17 23:21:59 +02:00
