docker/docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-11-14 04:50:52 +03:00
Code Activity
46,336 Commits 124 Branches 28 Tags
514d858774320094de4921041be955c837281bfd
Commit Graph

46336 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Victoria Bialas
29fd112ff7 Merge pull request #648 from londoncalling/d4win-d4mac-clarify-file-sharing-policies 
added troubleshooting info re: security policy and shared drives
 2016-11-18 14:24:05 -08:00
Victoria Bialas
66655a7e7b added troubleshooting info re: security policy and shared drives 
fixed some line numbering

backed out changes to d4mac, since the issue only applies to windows

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-11-18 14:07:59 -08:00
Misty Stanley-Jones
9b67312f10 Merge pull request #592 from xianlubird/master 
Update reschedule on node fail
 2016-11-18 13:54:03 -08:00
Joao Fernandes
f225403d4c Merge pull request #649 from joaofnfernandes/fix-backup 
Fix bad formatting in ucp docs
 2016-11-18 13:53:48 -08:00
Joao Fernandes
28e458993d Fix bad formatting in ucp docs 2016-11-18 13:46:41 -08:00
Victoria Bialas
2bdd19836c Merge pull request #646 from londoncalling/compose-examples-yml 
clarified use of .yml and .yaml for Compose file, both can be used
 2016-11-18 13:03:31 -08:00
Victoria Bialas
a259f45166 clarified use of .yml and .yaml for Compose file, both can be used 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-11-18 12:21:51 -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
Victoria Bialas
af1a2bf340 Merge pull request #645 from londoncalling/d4win-fix-stable-version-number 
fixed stable release number per user feedback on PR #616
 2016-11-18 11:40:16 -08:00
Victoria Bialas
c1dc1e40fb fixed stable release number per user feedback on PR #616 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-11-18 11:23:29 -08:00
LRubin
0d4d9d4077 Merge pull request #633 from sanscontext/cloud-api-docs 
CLOUD-3695 remove deprecated section from api docs
 2016-11-18 11:20:15 -08:00
LRubin
93ebd10872 stub for meta Docker ID topic 
Signed-off-by: LRubin <lrubin@docker.com>
 2016-11-17 17:36:50 -08:00
John Mulhausen
0b71b84ad4 Merge pull request #550 from davidwilliamson/patch-1 
Update compose example to work better with swarm
 2016-11-17 17:30:14 -08:00
Victoria Bialas
c88c38491f Merge pull request #611 from londoncalling/docs-feedback-optimize 
modify docs feedback to route support questions properly and encourag…
 2016-11-17 16:42:23 -08:00
Victoria Bialas
e626571c45 modify docs feedback to route support questions properly and encourage docs specific issues 
layout and wording changes per review comments

incorporated John's review comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-11-17 16:21:17 -08:00
LRubin
1d89236eff remove deprecated section from api docs 
Signed-off-by: LRubin <lrubin@docker.com>
 2016-11-17 15:45:37 -08:00
John Mulhausen
01e491d860 Merge branch 'master' of https://www.github.com/docker/docker.github.io 2016-11-17 15:35:50 -08:00
John Mulhausen
5e83b9659f Switch to touchend/mouseup for mobile compat 2016-11-17 15:35:37 -08:00
John Mulhausen
7caec61ef4 Merge pull request #573 from alternatekev/patch-1 
Update wordpress.md
 2016-11-17 15:27:46 -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
Misty Stanley-Jones
cdf97a8755 Merge pull request #630 from mstanleyjones/197_swarm_ingress_toc 
Add swarm routing mesh topic to TOC
 2016-11-17 14:48:16 -08:00
John Mulhausen
4e16d290c1 Merge pull request #609 from docker/mobile 
Make left nav persist in mobile, fix blue menu pop-in
 2016-11-17 14:41:59 -08:00
Misty Stanley-Jones
645e572146 Add swarm routing mesh topic to TOC 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-17 14:39:59 -08:00
Misty Stanley-Jones
84e9d44dfa Merge pull request #629 from riyazdf/notary-server-version 
Pin notary-server to v0.4.2
 2016-11-17 14:25:39 -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
LRubin
0dddbfa15b Merge pull request #612 from sanscontext/cloud-2887-builddet 
CLOUD-2887 updates for build reports
 2016-11-17 12:36:55 -08:00
LRubin
6965aa8b9b CLOUD-2887 updates for build reports 
Signed-off-by: LRubin <lrubin@docker.com>
 2016-11-17 12:35:34 -08:00
Misty Stanley-Jones
85aabbdb89 Merge pull request #628 from docker/221_start_swarm_node 
Adjust instructions for starting Swarm nodes
 2016-11-17 11:54:47 -08:00
Misty Stanley-Jones
2ce1b67e37 Adjust instructions for starting Swarm nodes 
Fixes #221
 2016-11-17 11:47:08 -08:00
Misty Stanley-Jones
13dc8451cf Fix syntax for passing options to volume create 2016-11-17 11:38:47 -08:00
Joao Fernandes
fd9cfbe0a5 Merge pull request #522 from clemenko/patch-1 
Updating the offline
 2016-11-17 11:29:13 -08:00
Joao Fernandes
9bbdfd5a06 Merge pull request #620 from sixeyed/patch-1 
Pre-reqs were listed as Step 2 and came before Step 1
 2016-11-17 11:27:35 -08:00
Victoria Bialas
c04f26182c Merge pull request #623 from docker/cue-none 
add 'none' cue to large screentext block
 2016-11-17 10:25:42 -08:00
Joao Fernandes
6528755aff Merge pull request #613 from joaofnfernandes/dtr-nfs-integration 
Add DTR NFS support
 2016-11-17 09:47:01 -08:00
LRubin
7da6a0bd21 add 'none' cue to large screentext block 
...to prevent weird syntax highlighting.
 2016-11-17 09:31:06 -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
LRubin
e889b0ed1d Merge pull request #614 from sanscontext/autotest 
Cloud: corrects to autotest descriptions
 2016-11-17 09:03:55 -08:00
Elton Stoneman
96a694049a Pre-reqs were listed as Step 2 and came before Step 1 2016-11-17 15:05:52 +00:00
Joao Fernandes
5a99cb7699 Add DTR NFS support 2016-11-16 18:15:28 -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
Misty Stanley-Jones
2a82508963 Change Dockerfile to fetch engine refs from docker/docker 1.12.x branch 
Update Dockerfile and NOT_EDITED_HERE manifest

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
 2016-11-16 15:50:24 -08:00
André Carvalho
f458e86929 machine: add available 3rd party drivers list (#250) 
* machine: add available 3rd party drivers list

This commit re-adds the deleted list of 3rd party drivers. I believe this was missed when moving the docs as this list is
referenced by other parts of the documentation.

Rename AVAILABLE_DRIVER_PLUGINS to AVAILABLE_DRIVER_PLUGINS.md

Update get-started-cloud.md

* machine: fix list of machine plugins markup
 2016-11-16 15:28:02 -08:00
John Mulhausen
2d730c0354 Fix for flickering blue mobile menu 2016-11-16 15:16:57 -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
John Mulhausen
8eaa59ff8b Make nav-sub persist in mobile 2016-11-16 14:57:20 -08:00
John Mulhausen
3aced3043e Merge pull request #608 from mstanleyjones/466_fix_redirect 
Remove redirect that was an error
 2016-11-16 14:32:47 -08: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
LRubin
260128dc73 removes references to autotest on push 
Signed-off-by: LRubin <lrubin@docker.com>
 2016-11-16 14:26:08 -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