Commit Graph

42422 Commits

Author SHA1 Message Date
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
Charles Smith 5d2e3ad0c9 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-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 ab533a98dceecec707414006544411cfd18b2d30)
Signed-off-by: Charles Smith <charles.smith@docker.com>
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 abd08f4784810bcf8b4e88e3f9ef1023cb15b8b5)

Signed-off-by: Charles Smith <charles.smith@docker.com>
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 d2fa978d4d66622a197eb98f9a77fa217e25f449)

Signed-off-by: Charles Smith <charles.smith@docker.com>
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 e168f0b4ad4dfc11a4423a6785d80153f0969808)

Signed-off-by: Charles Smith <charles.smith@docker.com>
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 d854c4fcc6255330693eee67b655606e92b11544)

Signed-off-by: Charles Smith <charles.smith@docker.com>
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 90308fd78315412c30da90217ee14515de4fbf8a)

Signed-off-by: Charles Smith <charles.smith@docker.com>
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 dee30443368b9ed8046733242410b8c32550ce0d)

Signed-off-by: Charles Smith <charles.smith@docker.com>
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 c1bdda0be8616f987245cb61a4aedc09c8b5c806)

Signed-off-by: Charles Smith <charles.smith@docker.com>
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 bbd5396955a8c36b9f208d64fe580b769c1686f5)

Signed-off-by: Charles Smith <charles.smith@docker.com>
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 46cb1f2601afc2eb99cc31ced362d874c8c3c192)

Signed-off-by: Charles Smith <charles.smith@docker.com>
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 6fa69d2d0610320cce61517eca6e4471f5381561)

Signed-off-by: Charles Smith <charles.smith@docker.com>
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 b4abe38d43f1158b3c085ef006e88740296a3020)

Signed-off-by: Charles Smith <charles.smith@docker.com>
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 45cb33e65ca5bb247e2e9f425b4441ad6a08aa51)

Signed-off-by: Charles Smith <charles.smith@docker.com>
2016-08-26 15:41:54 -07:00
Sven Dowideit d252e6ac51 Merge pull request #557 from SvenDowideit/add-jenkinsfile
Add docs checking Jenkinsfile
2016-08-24 14:57:40 +10:00
Sven Dowideit 677967c4f1 Add docs checking Jenkinsfile
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2016-08-22 12:25:51 +10:00
Nathan LeClaire db24b21660 Merge pull request #555 from docker/1.12.1
Bump to 1.12.1
2016-08-18 16:57:03 -07:00
Nathan LeClaire 768f358596 Bump to 1.12.1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-18 16:58:13 -07:00
Nathan LeClaire 41b3b25335 Bump version to 0.8.1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-18 16:29:40 -07:00
Nathan LeClaire 81424e7b52 Move generated systemd unit file closer to upstream
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-08-18 16:11:54 -07:00
Ahmet Alp Balkan f212b53d43 azure: update docs with updated default param
Update `--azure-image` param documented that changed in

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-08-18 16:11:47 -07:00
Ahmet Alp Balkan 3fe6f7f33c azure: increase log level for info statement
This should have been info in the first place.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-08-18 16:11:40 -07:00
Ahmet Alp Balkan f63aaa20dd azure: bump default image to Ubuntu 16.04.0-LTS
Ubuntu 15.10 image is EOL'd and removed from azure.
Closes #3676.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-08-18 16:11:30 -07:00
Dongluo Chen 27968edd8a Merge pull request #2454 from dongluochen/bump-v1.2.5
Bump version to 1.2.5
2016-08-18 16:05:59 -07:00
Dong Chen 04114bb5b5 Bump version to 1.2.5
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
2016-08-18 16:03:39 -07:00