Commit Graph

237 Commits

Author SHA1 Message Date
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 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
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
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 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