docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
44,416 Commits 13 Branches 28 Tags 823 MiB
Commit Graph

401 Commits

Author SHA1 Message Date
Misty Stanley-Jones 3f96d48075 Revamp the binary install guide 2016-12-02 09:28:34 -08:00
MiaoYanqiang 43c4656ae6 update uninstall instructions of centos and fix a bad format (#767) 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-12-02 00:46:03 -08:00
Misty Stanley-Jones 11cbfeaa5e Arch Linux supports devicemapper 
Fixes #682
 2016-11-30 18:03:16 -08:00
Misty Stanley-Jones 2f9417d219 Merge pull request #292 from emalloy/patch-1 
Update debian.md
 2016-11-30 17:54:47 -08:00
Misty Stanley-Jones 81400442e9 Merge pull request #710 from miaoyq/completed-journald-metadata 
Completed metadata of the journald log driver
 2016-11-30 17:43:27 -08:00
SRINIVASA RAO GURUBELLI 9aa7706799 Option --network not valid at least with the latest docker (#755) 
--network option not valid with docker version 1.11.2. So, proposing to change --network to --net
--network=my-bridge-network
 2016-11-30 17:07:25 -08:00
Matt Bentley d915deff95 Move rebalcing to be a top level item (#753) 
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
 2016-11-30 14:53:42 -08:00
Sergey Kukunin 9b1b56a05d Extend Logging documentation (#722) 
* Extend Logging documentation

Make it more explicit, fix confusion about `json-file` defaults driver

* Added how to find the default logging driver
 2016-11-30 10:49:49 -08:00
em 9801b2d8d8 Update debian.md 
Add gnupg2, required for `apt-key` invocation
 2016-11-29 17:35:44 -05:00
Andrew Hsu faf64b79f6 revert yakkety addition for now 
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
 2016-11-29 10:53:43 -08:00
Sebastiaan van Stijn 951b19a398 Merge pull request #627 from docker/325_volume_create_opt_syntax 
Fix syntax for passing options to `volume create`
 2016-11-29 17:03:29 +01:00
Misty Stanley-Jones d74f9153b9 Merge pull request #412 from mstanleyjones/troubleshooting_volume_errors.md 
Add topic about troubleshooting volume problems
 2016-11-28 16:15:54 -08:00
Misty Stanley-Jones c4c047f5f2 Add to swarm admin docs 
- Add details about maintaining quorum
- Add details about pending tasks

Relates to #26017
Relates to #25069

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-28 15:59:18 -08:00
Misty Stanley-Jones 1b8631d28c Document publishing a UDP port 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-28 15:41:00 -08:00
John Mulhausen 90819b7133 Merge branch 'master' of https://github.com/docker/docker.github.io 2016-11-28 15:00:23 -08:00
John Mulhausen 526a9b90ab Fixing merge conflict 2016-11-28 14:59:56 -08:00
John Mulhausen 70617e697b Adding Yakkety to opening list 2016-11-28 14:58:10 -08:00
John Mulhausen 921964a17c s/sizes/size 2016-11-28 14:55:56 -08:00
John Mulhausen 0891e122cf Merge pull request #408 from yangyuqian/explain_downloaded_image_and_container_size 
Explain downloaded image and container sizes
 2016-11-28 14:55:08 -08:00
John Mulhausen 2e5892e4a5 Writerly changes 2016-11-28 14:52:55 -08:00
John Mulhausen 2f817e465b Fix merge conflicts 2016-11-28 14:44:22 -08:00
John Mulhausen a5bf14e5f9 Merge pull request #334 from mstanleyjones/run_reference_reorg 
Add topic about limiting container resources
 2016-11-28 14:37:10 -08:00
Misty Stanley-Jones a9e535f3bd Merge pull request #610 from fbouliane/add-dns-host-to-instructions 
Add DNS SubjectAltName to certificate recipe
 2016-11-28 11:59:16 -08:00
Misty Stanley-Jones 756f4d974c Fix some doubled words 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-28 11:32:17 -08:00
Manmeet Gill 3bcd9b455c Replace 'ls Dockerfile' with 'ls' 
Running `ls Dockerfile`, if following the guide, would give you nothing. Dockerfile is not a directory.
Running `ls` would *return* `Dockerfile`.
 2016-11-27 16:44:36 +11:00
Yanqiang Miao bda7d072ec Completed metadata of the journald log driver 
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn>
 2016-11-24 18:30:25 +08:00
Sebastiaan van Stijn 4364535cfc Merge pull request #640 from mstanleyjones/203_dns_server_ubuntu 
Rewrites to Ubuntu installation
 2016-11-24 01:44:22 +01:00
Misty Stanley-Jones d0fb13dc13 Add redirect for /articles/networking/ 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-23 16:36:35 -08:00
Misty Stanley-Jones 718296c37d Rewrites to Ubuntu installation 
Fixes #203
 2016-11-23 16:11:57 -08:00
Misty Stanley-Jones a4b2357e14 Clarification about flocker driver (#626) 
* Clarification about flocker driver

Fixes #324
 2016-11-23 15:42:34 -08:00
LRubin eeace80825 Merge pull request #698 from sanscontext/more-d-id 
remove some unneeded text with new Docker ID topic
 2016-11-23 13:09:11 -08:00
Misty Stanley-Jones 013d8f09fd Merge pull request #631 from mstanleyjones/followup_link_flag 
Add a little more clarification about --link
 2016-11-23 12:28:04 -08:00
Alessandro Boch d3155b9482 About the docker_gwbridge network (#400) 
* About the docker_gwbridge network

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-11-23 12:21:33 -08:00
Misty Stanley-Jones 0fb5e646a6 Update 'Working with networks' topic 
Verify all the steps, make modifications where necessary
Rewrite for grammar and clarity
Add explanation for unclear sections
Adapt some sections to a stepped tutorial style

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-23 12:09:13 -08:00
LRubin c23aa3a813 remove some unneeded text with new Docker ID topic 
Signed-off-by: LRubin <lrubin@docker.com>
 2016-11-23 11:13:44 -08:00
Srikar b9e40eb629 Updated the link text to "the instructions for installing Docker on Ubuntu" 2016-11-22 16:42:18 +05:30
Srikar b356a0b20a Updated the URL syntax in mark down at line 73 2016-11-22 13:04:46 +05:30
John Mulhausen 30772c6703 Merge pull request #511 from mstanleyjones/pull_docker_refs_from_git 
Pull docker refs from git
 2016-11-18 16:09:37 -08:00
LRubin 26ce688e26 Adds a space to correct broken code block 
Kramdown is picky. :)
 2016-11-18 15:31:25 -08:00
Bhumika Bayani 707b0359f4 live-restore unsupported on Windows (#564) 
* live-restore unsupported on Windows
Replaced heading with note. Review comment implementation
Fixes doc for https://github.com/docker/docker/issues/28295
Added quote formatting for a note

* Moved the note, some rewording

The situation is actually more complicated than that. If you develop Linux containers on Windows, you can still use Live Restore. So I tried to make it more clear.

Also moved the note to the top of the file since there is no point making people read a whole long thing if it won't work for them.
 2016-11-18 14:36:26 -08:00
Misty Stanley-Jones 97d8ab167d Add topic about limiting container resources 
Moved from upstream PR https://github.com/docker/docker/pull/26791

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
(cherry picked from commit 0a924369dc086a19bb0484ca2a53fb485ed99801)
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-18 12:02:35 -08:00
Misty Stanley-Jones d27ac5e970 Add a little more clarification about --link 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-17 14:54:22 -08:00
Riyaz Faizullabhoy 4725674a2f Pin notary-server to v0.4.2 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-11-17 14:11:56 -08:00
Misty Stanley-Jones 13dc8451cf Fix syntax for passing options to `volume create` 2016-11-17 11:38:47 -08:00
Misty Stanley-Jones 7d099ea4b0 Add info about using docker logs 
Fixes #293

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-17 09:15:00 -08:00
Misty Stanley-Jones 00b4a1ab00 Remove the naming digression from the networking tutorial 
Fixes #575
 2016-11-16 17:02:21 -08:00
Misty Stanley-Jones d2e8ccf844 Remove engine docs for refs, plugins, deprecated from docs source 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-16 15:51:05 -08:00
Félix Bouliane 71368b49c3 Add DNS SubjectAltName to certificate recipe 
If a SubjectAltName is present, the certificates CommonName should be
discarded by the clients. This ensure that people following the guide
generates valid certificates.
 2016-11-16 17:59:59 -05:00
Misty Stanley-Jones 9f8db0f7d9 Remove redirect that was an error 
fixes #466

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-16 14:27:52 -08:00
Misty Stanley-Jones 1e688adaa7 Merge pull request #540 from dhauenstein/patch-1 
Added GID to USER instruction
 2016-11-16 14:25:00 -08:00
John Mulhausen a0719b1ad0 Merge pull request #597 from guillaumeguerin/patch-1 
Update step_four.md
 2016-11-16 11:43:59 -08:00
John Mulhausen 5a8b80278e Merge pull request #579 from scottlaw1/patch-1 
Change "tho" to "though"
 2016-11-16 11:43:12 -08:00
Magnus Lyckå 2f565d6327 Change apt-key keyserver URL 
Changed keyserver URL for apt-key to hkp://ha.pool.sks-keyservers.net:80 as it is when you install with the get.docker.com script.
The old URL hkp://p80.pool.sks-keyservers.net:80 caused an error about "gnutls_handshake() failed" on apt update.
 2016-11-16 16:17:14 +01:00
Guerin ad491d6d9f Update step_four.md 
Added a link to the vi text editor website.
 2016-11-16 14:55:58 +01:00
Misty Stanley-Jones 089d9100fd Update understanding-docker.md (#406) 
* Update understanding-docker.md

* Update understanding-docker.md
 2016-11-15 16:06:04 -08:00
Scott A. Lawrence babd3da5e7 Change "tho" to "though" 2016-11-15 14:28:37 -05:00
Misty Stanley-Jones 185b5db95d Provide clarification on status of `--link` 
Fixes #353
 2016-11-15 10:32:58 -08:00
Daniel Hauenstein a726bf5ab8 rephrase description of adding GUI to USER instruction 
Avoiding passive voice in description of adding a GUI to the USER
instruction
 2016-11-15 13:18:47 +01:00
Stefan Wüthrich 8c2a09e5e6 Update ubuntulinux.md 
Adding Yakkety Deb
 2016-11-15 06:43:02 +01:00
fresnizky b0e05667f9 Added command for ssh into swarm manager 2016-11-12 19:27:34 -03:00
Misty Stanley-Jones b480b75413 Merge pull request #433 from docker/revert-175-patch-1 
Revert "Engine reference BUILD tarball contexts mangled"
 2016-11-11 16:25:40 -08:00
Gaetan a5e01e1844 fix type of keywords entry in frontmatter (in /engine/) (#552) 
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-11 14:45:24 -08:00
Daniel 1cead3926f Added GID to USER instruction 
The USER instruction allows to set UID, but also GID by adding a group name to the UID separated by a colon. This should be reflected in the documents as well, as no GROUP instruction exists.
 2016-11-11 10:50:47 +01:00
Gaetan 57b45d5f8d fix duplicated page titles (#512) 
this also breaks page consistency, regarding anchor links (see #510)

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-09 16:35:33 -08:00
Sebastiaan van Stijn db153d8d2f
Revert "remove ubuntu wily 15.10" 
This reverts the changes made in
https://github.com/docker/docker.github.io/pull/35 (300486bd77)

Support for unbuntu 15.10 is removed in
Docker 1.13, but still available in Docker 1.12

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2016-11-09 14:12:59 +01:00
Misty Stanley-Jones a6fa66c786 Add topic about troubleshooting volume problems 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-08 09:20:11 -08:00
Misty Stanley-Jones ff59423a39 Merge pull request #440 from rillig/we-you 
Replace "we" with "you", as per the style guide
 2016-11-07 14:51:32 -08:00
Hernandes Benevides de Sousa 71ff5c1589 Add missing whitespace (#486) 2016-11-07 13:13:33 -08:00
Michel van Os 3882cb1476 Updated link in step_four.md (#478) 
* Updated link in step_four.md

Link to nano-editor is inconsistent with other links.

* Update step_four.md
 2016-11-06 18:52:13 -08:00
Roland Illig d35d1f7e2f Stylistic cleanup in usingdocker.md 
- wrap lines
- update version numbers and dates
- remove -ing from headings
- remove redundant text
 2016-11-07 00:35:52 +01:00
Roland Illig 2c9eff5bc9 Replace "we" with "you", as per the style guide 2016-11-07 00:20:05 +01:00
Alexis Bellido b01714f7f5 Clarify the fact that VOLUME does not support host-dir 2016-11-06 12:03:49 -05:00
John Mulhausen a0aa3e7321 Reword and reformat "Breaking changes" page (#473) 
* Update breaking_changes.md

* Update breaking_changes.md

* Update breaking_changes.md

* Update breaking_changes.md

* Update breaking_changes.md

* Update breaking_changes.md
 2016-11-05 16:18:41 -07:00
Roberto Aguilar 54338099ae Update service_create.md 
Fixed "propation" typo
 2016-11-05 18:02:49 -04:00
John Mulhausen 4bd2d0274f Fixes #447 2016-11-04 17:37:42 -07:00
John Mulhausen 949a89e6ea Merge pull request #152 from mstanleyjones/redirect_from 
Change 'alias:' to 'redirect_from:' so aliases work again
 2016-11-04 17:34:27 -07:00
John Mulhausen 37f3456cba Update service_ps.md 2016-11-04 17:27:50 -07:00
John Mulhausen 69035630db Update dockerd.md 2016-11-04 17:26:56 -07:00
John Mulhausen 8e46f2102b Update legacy_plugins.md 2016-11-04 17:25:52 -07:00
Misty Stanley-Jones eb5c8670bc Change instances of alias: to redirect_from: 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-04 17:07:02 -07:00
Stefan Lasiewski 47b8beb964 Fix broken link for [compatibility matrix] 2016-11-04 16:53:53 -07:00
Misty Stanley-Jones 66a183b254 Merge pull request #451 from aboch/movl 
Clarify the mtu option is supported by overlay driver
 2016-11-04 16:09:33 -07:00
John Mulhausen 558314bf56 Converges titles to imperative-form, front-matter based, and sentence-case (#438) 
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
 2016-11-04 15:38:40 -07:00
Alessandro Boch 932be92012 Clarify the mtu option is supported by overlay driver 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2016-11-04 15:00:21 -07:00
Misty Stanley-Jones 1a193d749b Revert "Merge pull request #437 from gdevillele/fix_keywords_format" 
This reverts commit 13ddc1350e, reversing
changes made to 7a11f05943.
 2016-11-04 13:33:29 -07:00
Misty Stanley-Jones 33d3d067d0 Revert "fix some frontmatter keywords values" 2016-11-04 13:30:04 -07:00
Kenfe-Mickael Laventure 1183c2d428 Add installation instructions for rapsbian-jessie 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-11-04 11:44:00 -07:00
Misty Stanley-Jones 13ddc1350e Merge pull request #437 from gdevillele/fix_keywords_format 
fix some frontmatter keywords values
 2016-11-04 10:50:53 -07:00
Gaetan 8bb4d6226a fix more frontmatter keywords values (#439) 
* fix format of frontmatter keyword entry in some .md files

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-04 10:48:38 -07:00
Kim Spasaro 2739a8eece fixing typo 2016-11-04 10:45:32 -05:00
John Mulhausen 1fa3a3b686 Formatting fix 2016-11-03 18:14:15 -07:00
Stewart Rand c1e679a489 Grammar 
Better grammar.
 2016-11-03 15:13:09 -03:00
Gaetan de Villele 7a11f05943 fix some frontmatter keywords values 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2016-11-03 10:22:12 -07:00
Misty Stanley-Jones c13359b741 Fixed URLs in examples 2016-11-02 13:36:02 -07:00
Misty Stanley-Jones 66cbcac67f Revert "Engine reference BUILD tarball contexts mangled" 2016-11-02 13:31:08 -07:00
Gökay Gürcan ba9ea84fee fix: Add line breaks before and after code blocks 2016-11-02 11:20:02 +02:00
Adrien Duermael 8fa5f3a5de absolute links to docs.docker.com are now relative links 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-11-01 17:01:41 -07:00
John Mulhausen 2a696ed430 Merge pull request #367 from cavemandaveman/dockerd 
Alphabetize daemon config file options
 2016-11-01 12:18:44 -07:00
John Mulhausen f201f50501 Merge pull request #399 from aduermael/master 
removed menu.md files
 2016-11-01 12:07:20 -07:00
John Mulhausen 28a16a7d16 Merge pull request #392 from xcellardoor/patch-1 
Update centos.md
 2016-11-01 12:01:15 -07:00
Yuqian Yang fa5e8c3d5c Explain downloaded image and container sizes 
Signed-off-by: Yuqian Yang <boscoyoung@gmail.com>
 2016-11-01 18:48:25 +08:00
John Mulhausen 66c34857a6 Fixes #393 2016-10-31 16:09:06 -07:00
John Mulhausen 76a96a70e8 Merge pull request #386 from WeiZhang555/fix-doc 
Fix incorrect devicemapper thinpool device name
 2016-10-31 16:07:17 -07:00
John Mulhausen 14037bd93c Merge pull request #398 from docker/johndmulhausen-patch-1 
Adding alias to Fix #391
 2016-10-31 15:13:25 -07:00
John Mulhausen 1a75a36169 Add alias to fix #388 2016-10-31 14:05:21 -07:00
John Mulhausen 321be53a48 Adding alias to Fix #391 2016-10-31 13:46:38 -07:00
Adrien Duermael e7ab7f7d03 removed menu.md files 
Signed-off-by: Adrien Duermael <adrien@duermael.com>
 2016-10-31 13:45:56 -07:00
Sam Cater 345d1b609d Update centos.md 
I've added in the '--rm' argument to the 'script method' and to the 'add your user to docker group' examples to match the first instruction. Purely a consistency thing, and so new users can appreciate not having a few hello-world containers spawned. Ta.
 2016-10-30 23:03:07 +00:00
Low Jeng Lam bf0ca906f5 Typo "note" 2016-10-30 16:03:06 +08:00
Sebastian C. Bürgel ef63167608 updated keyserver 
As pointed out in the issue https://github.com/docker/docker/issues/24493#issuecomment-231752995 the keyserver seems to have changed. Otherwise the installer breaks.
 2016-10-29 15:06:30 +02:00
Zhang Wei 852b8ca424 Fix incorrect devicemapper thinpool device name 
Correct device name should be `docker-thinpool` instead of
`docker-thinpool-tpool`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-10-29 17:51:33 +08:00
Sebastiaan van Stijn 109a25c230 Merge pull request #366 from riyazdf/dirty-cow 
Add dirty COW security event
 2016-10-29 00:58:27 -07:00
Riyaz Faizullabhoy 196a1886b7 dirty COW security event 
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
 2016-10-29 00:11:33 -07:00
Roland Illig d69c0184eb Fix spelling in Getting started, step two 2016-10-29 01:39:38 +02:00
John Mulhausen 14a611f87e Merge pull request #304 from konstruktoid/issue_294 
Remove line numbers from caps link
 2016-10-28 02:57:26 -07:00
cavemandaveman bda6bc6bf6 Alphabetize daemon config file options 2016-10-27 14:11:03 -05:00
lbausch 110d94b9a1 Add missing whitespace 2016-10-27 14:04:36 +02:00
Thomas Sjögren 05e7b79da0 add L62-L77 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2016-10-27 11:26:33 +02:00
Misty Stanley-Jones 34e383c602 Formatting 2016-10-25 14:49:08 -07:00
Misty Stanley-Jones a4d2e0915d Formatting 2016-10-25 14:24:12 -07:00
Misty Stanley-Jones bb957c06b6 Formatting 2016-10-25 12:15:51 -07:00
Victoria Bialas f48157d696 Update swarm-mode.md 2016-10-25 12:11:35 -07:00
Misty Stanley-Jones 26afe3deec Formatting 2016-10-25 12:06:40 -07:00
Misty Stanley-Jones ca21999b4c Formatting 2016-10-25 12:01:18 -07:00
Misty Stanley-Jones 82fe40bff7 Formatting 2016-10-25 12:00:07 -07:00
Misty Stanley-Jones 8bd6719933 Formatting 2016-10-25 11:58:38 -07:00
Misty Stanley-Jones 7a0fbcf6f1 Update breaking_changes.md 2016-10-25 11:54:50 -07:00
Misty Stanley-Jones 25a9bcf2d0 Formatting 2016-10-25 11:51:57 -07:00
Misty Stanley-Jones f39d909fdd Formatting 2016-10-25 11:40:39 -07:00
Misty Stanley-Jones 458ab09eed Formatting 2016-10-25 11:37:56 -07:00
Misty Stanley-Jones 8308f5eca6 Formatting 2016-10-25 11:27:16 -07:00
Misty Stanley-Jones 00511c620d Formatting 2016-10-25 11:19:12 -07:00
John Mulhausen e0760748dc Fix for #290 2016-10-24 18:50:01 -07:00
John Mulhausen 10b907190f Fix #332 
Fix #332
 2016-10-24 18:40:19 -07:00
John Mulhausen 74c1b60806 Merge pull request #323 from dusek/fix-gem2.0-not-found 
dockerimages.md: fix "gem2.0: command not found"
 2016-10-24 18:35:27 -07:00
John Mulhausen 03b2d5be51 Merge pull request #318 from weslord/master 
Add aliases to engine/reference/ subdirs for backwards compatible links
 2016-10-24 18:34:29 -07:00
Boris Dušek 641a2137bd dockerimages.md: fix "gem2.0: command not found" 2016-10-23 13:30:46 +02:00
weslord 076c060ddf Removed a space from Dockerfile Best Practices 2016-10-23 04:17:27 -07:00
weslord 8ac3830f70 Add aliases to engine/reference/ subdirs for backwards compatible links 2016-10-22 15:32:58 -07:00
John Mulhausen 25342006d9 Merge pull request #302 from krerkkiat/patch-1 
Update archlinux.md so it renders section title correctly
 2016-10-22 13:27:28 -07:00
John Mulhausen 802121e482 Merge pull request #309 from dgvigil/master 
Moving sudo command after echo pipe for Ubuntu install
 2016-10-22 13:25:47 -07:00
John Mulhausen 04c0220bc6 Merge pull request #299 from donaldali/patch-1 
Remove duplicate `to` from glossary.md
 2016-10-22 13:23:41 -07:00
John Mulhausen bd27f18e1c Merge pull request #316 from robeerob/patch-1 
Update step_three.md due to Docker Hub changes
 2016-10-22 13:19:20 -07:00
John Mulhausen 5415c33ea7 Merge pull request #311 from friism/patch-2 
fix anchor
 2016-10-22 13:17:53 -07:00
Robert Axelsen 8ca376c348 Update step_three.md due to Docker Hub changes 
I went through the tutorial myself, and could not find any "Browse and Search" link to click on Docker Hub page. Update to reflect that this step is now superfluous.
 2016-10-22 18:35:25 +02:00
4c74356b41 d24834fceb fixing typo 2016-10-22 12:37:05 +03:00
Michael Friis cd0f5c4888 fix anchor 
Signed-off-by: Michael Friis friism@gmail.com
 2016-10-21 17:00:25 -07:00
John Mulhausen 5435bfd362 Update device-mapper-driver.md 2016-10-21 14:31:30 -07:00
Vigil 8341768fd7 fix: Moving sudo command after echo pipe 2016-10-21 15:11:23 -06:00
Thomas Sjögren f2f8532ca9 fix storage-driver-options 404 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2016-10-21 15:50:11 +02:00
Thomas Sjögren a61c5998f1 remove line numbers from caps link 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2016-10-21 15:23:36 +02:00
Krerkkiat Chusap 13e5fa3629 Update archlinux.md 
Add newline before the Uninstallation section since it is displayed as the raw text (## Uninstallation) on the website.
 2016-10-21 00:33:03 -04:00
Donald Ali 5095f84979 Remove duplicate `to` from glossary.md 2016-10-20 16:54:56 -07:00
Misty Stanley-Jones e4a2991808 Merge pull request #146 from mstanleyjones/faq_rhel_version 
Update the FAQ for RHEL and Windows
 2016-10-20 11:32:47 -07:00
Misty Stanley-Jones e442a215b6 Update the FAQ for RHEL and Windows 
RHEL 6.5 is not supported
Windows info was way out of date
 2016-10-20 11:31:07 -07:00
Misty Stanley-Jones 717d64348b Additional information about scaling a service 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-20 11:03:36 -07:00
Joao Fernandes 67cca0c72e Merge pull request #281 from konstruktoid/admin_ansible 
add engine/admin/ansible/
 2016-10-20 10:24:17 -07:00
John Mulhausen bd630e9e3b Update dockerlinks.md 2016-10-19 22:53:52 -07:00
John Mulhausen 60c9df35d9 Merge pull request #282 from mstanleyjones/add_macvlan_to_toc 
Add get-started-macvlan.md to TOC
 2016-10-19 22:51:38 -07:00
Misty Stanley-Jones d92715537f Merge pull request #230 from afrazkhan/master 
Info about IP 50 needing to be open
 2016-10-19 14:52:10 -07:00
Misty Stanley-Jones cdaef772f8 Merge pull request #125 from sicwolf/patch-1 
Wrong destination folder in container
 2016-10-19 14:50:31 -07:00
Misty Stanley-Jones 9c1de966a7 Add get-started-macvlan.md to TOC 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-19 13:45:14 -07:00
Thomas Sjögren 5d9da643d6 add engine/admin/ansible/ 
Signed-off-by: Thomas Sjögren <konstruktoid@users.noreply.github.com>
 2016-10-19 22:02:26 +02:00
John Mulhausen bb793f22d0 Merge pull request #175 from dsheets/patch-1 
Engine reference BUILD tarball contexts mangled
 2016-10-19 10:43:46 -07:00
John Mulhausen fdb632d304 Merge pull request #265 from liubin/liubin-patch-1 
fix markdown syntax issue
 2016-10-19 10:42:41 -07:00
John Mulhausen 8b0e8bd12f Fix for issue #273 2016-10-19 10:41:34 -07:00
John Mulhausen 41f871d884 Merge pull request #275 from dvoytik/patch-1 
docs: add one missing blank and remove double blanks
 2016-10-19 10:37:19 -07:00
Misty Stanley-Jones a8ab9ee8fb Fix markdown error introduced in #261 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-19 09:29:24 -07:00
Dmitry Voytik 323259f2c4 add one missing blank and remove double blanks 
add one missing blank and remove double blanks
 2016-10-19 17:43:14 +02:00
Sebastiaan van Stijn f40170a796 Merge pull request #261 from mstanleyjones/167_clarify_apt_repo 
Clarify how to verify the APT source
 2016-10-18 18:03:16 -07:00
John Mulhausen f8776699de Merge pull request #223 from danix800/fix-typos 
Fix typos.
 2016-10-18 16:31:21 -07:00
Misty Stanley-Jones b0c831bd0b Clarify how to verify the APT source 
Fixes #167

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-18 15:40:33 -07:00
Danny Garcia 543f7ca548 Correct YAML frontmatter to reflect deprecation of boot2docker 2016-10-18 18:39:06 -04:00
John Mulhausen cc60beb64d Formatting fixes 2016-10-18 13:00:10 -07:00
Bin Liu 40eef2da44 fix markdown syntax issue 
The markdown issue generated a strange html page at https://docs.docker.com/engine/reference/commandline/swarm_leave/
 2016-10-19 01:29:15 +08:00
Misty Stanley-Jones 01910ab6d9 Update branding for macOS 
Apple has changed their branding guidelines from 'OS X' to 'macOS'
so we should update ours to be within trademark / branding
guidelines. See http://www.apple.com/macos/sierra/

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-10-18 09:21:09 -07:00
Ding Fei bab82e94f6 Fix typos and updated a few links, some sentences. 
Signed-off-by: Ding Fei <dingfei@stars.org.cn>
 2016-10-18 17:04:10 +08:00
Afraz Ahmadzadeh dcfbf407b0 Typo in docs 2016-10-18 07:58:08 +02:00
Sebastiaan van Stijn fc6db798d1 Merge pull request #232 from milindchawre/doc-change 
Fixes #26818 : Removing bad reference in docker volumes tutorial
 2016-10-17 16:51:46 -07:00
milindchawre 9ce069647a Fixes #26818 : Removing bad reference in docker volumes tutorial 
Signed-off-by: milindchawre <milindchawre@gmail.com>
 2016-10-17 11:54:32 +00:00
Afraz Ahmadzadeh 0dcdc43cb1 Info about IP 50 needing to be open 2016-10-17 10:29:28 +02:00
yuexiao-wang adbe6d1dac Fix the command and typo for trust_sandbox 
Signed-off-by: yuexiao-wang <wang.yuexiao@zte.com.cn>
 2016-10-14 17:35:13 +08:00
drlukeangel d0eaa59c88 Small update to the scale documentation (#142) 
* Small update to the scale documentation

Just a small update to make it a bit clearer with a bit more functionality.
 2016-10-13 08:57:33 -07:00
Misty Stanley-Jones 2ea55d74ad Provide a backup for old config when configuring devicemapper (#149) 
* Provide a backup for old config when configuring devicemapper

* Adding blank line to avoid rendering issues
 2016-10-12 15:44:18 -07:00
David Sheets 7b41a45abe Engine reference BUILD tarball contexts mangled 
Closed code fence, removed duplicate text. Perhaps caused by bad merge?
 2016-10-12 12:23:12 +01:00
Misty Stanley-Jones 232043cfa6 Merge pull request #148 from mstanleyjones/swarm_add_node_clarify 
Clarify what happens when a failed swarm node recovers
 2016-10-11 16:14:52 -07:00
Misty Stanley-Jones 62f4a04e39 Clarify what happens when a failed swarm node recovers 
Fixes #105
 2016-10-11 16:13:04 -07:00
Misty Stanley-Jones 6955815d23 Merge pull request #111 from yuj/patch-1 
Update restart.md
 2016-10-11 15:53:52 -07:00
Ben Firshman e4dfc61fab
Update Go client to docker/docker/client 
This has moved from docker/engine-api.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-10-11 13:59:27 +02:00
John Mulhausen 2b6cbd8255 Merge pull request #150 from BSCheshir/patch-2 
node1
 2016-10-11 01:39:48 -07:00
John Mulhausen fd905d3b26 Merge pull request #124 from RStrydom/patch-1 
Update step_four.md
 2016-10-11 01:26:45 -07:00
John Mulhausen 1dc817611b Formatting fixes 2016-10-11 01:24:55 -07:00
John Mulhausen 0937284ec7 Merge branch 'master' of https://www.github.com/docker/docker.github.io 2016-10-11 01:10:21 -07:00
John Mulhausen ac39558cb1 Formatting fix 2016-10-11 01:10:13 -07:00
John Mulhausen 9ee229caca Update index.md 2016-10-11 01:02:07 -07:00
Water Wang 96eec5a7b9 Update dockervolumes.md - Changed all wrong /opt/webapp 
Changed all wrong /opt/webapp as /webapp

/opt/webapp of web container includes app.py, if set destination folder as /opt/webapp, app.py is not visible and below error log presents and the web container will exit, so it's better to set the destination folder as /webapp.

docker logs -f web
python: can't open file 'app.py': [Errno 2] No such file or directory
 2016-10-11 09:54:25 +08:00
Misty Stanley-Jones e916f7f88e Change 'draft: true' to 'published: false' for Jekyll 2016-10-10 16:19:47 -07:00
Misty Stanley-Jones a41d952d78 Merge pull request #117 from mbentley/add-deferred-deletion 
Add deferred deletion to recommended dm options
 2016-10-10 15:52:42 -07:00
Misty Stanley-Jones f0b832357f Merge pull request #141 from mstanleyjones/choosing_port_vs_automatic 
Fix incorrect information about swarm port assignment
 2016-10-10 15:32:12 -07:00
Matt Bentley 5423de94f0
Add deferred deletion to recommended dm options 
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
 2016-10-10 18:05:11 -04:00