docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
43,795 Commits 25 Branches 28 Tags 827 MiB
Commit Graph

43795 Commits

Author SHA1 Message Date
Victoria Bialas fd49e78fb0 clarify syntax on swarm heartbeat for create machine command 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-11-21 11:40:28 -08:00
Victoria Bialas d5df4967f9 Merge pull request #594 from dsheets/patch-4 
Docked for Mac: Custom host CA certs in stable
 2016-11-21 11:21:31 -08:00
LRubin 6075f9a794 remove fragment 
removing a random sentence fragment.
 2016-11-21 10:40:44 -08:00
LRubin beb9a97556 Merge pull request #656 from MicahZoltu/patch-1 
Minor technical correction.
 2016-11-21 09:54:31 -08:00
Micah Zoltu adfc2cbcbc Minor technical correction. 
`$IMAGE_NAME` is actually `$DOCKER_REPO:$DOCKER_TAG`, not `$DOCKER_REPO/$DOCKER_TAG`.  This mistake confused me and made me think that `$DOCKER_REPO` was something like `index.docker.io/MyName` rather than `index.docker.io/MyName/MyProject`.
 2016-11-19 13:22:01 -08:00
John Mulhausen 57fcd95be9 Reverting reversion, geez 2016-11-18 19:08:42 -08:00
John Mulhausen 65ff90c6bb Merge branch 'master' of https://github.com/docker/docker.github.io 2016-11-18 19:05:14 -08:00
John Mulhausen 69f07bcd1e Revert "Merge pull request #654 from mstanleyjones/fix_dockerfile" 
This reverts commit 2ede6ff7f0, reversing
changes made to 30772c6703.
 2016-11-18 19:04:42 -08:00
John Mulhausen 0060ef460a merge conflict fixes 2016-11-18 18:58:26 -08:00
John Mulhausen 9bdefe1f07 Merge branch 'auto-issue-assign' 2016-11-18 18:55:28 -08:00
John Mulhausen 9aadd420ba Merge branch 'master' into auto-issue-assign 2016-11-18 18:55:10 -08:00
John Mulhausen 0c2c69b527 Make offsite edit this page links file-specific 2016-11-18 18:55:07 -08:00
John Mulhausen 99c9555130 Adding 1.12.x specific links 2016-11-18 18:51:05 -08:00
John Mulhausen 2ede6ff7f0 Merge pull request #654 from mstanleyjones/fix_dockerfile 
Fixing the Dockerfile
 2016-11-18 16:45:15 -08:00
Misty Stanley-Jones fbab0cf7b9 Fixing the Dockerfile 2016-11-18 16:40:06 -08:00
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
Joao Fernandes 3ea168e548 Merge pull request #652 from joaofnfernandes/dtr-on-ucp 
Make clear that DTR needs UCP
 2016-11-18 15:42:50 -08:00
Joao Fernandes b396fd2804 Add links to DTR config 2016-11-18 15:41:45 -08:00
LRubin 26ce688e26 Adds a space to correct broken code block 
Kramdown is picky. :)
 2016-11-18 15:31:25 -08:00
Joao Fernandes b7b62b87b2 Make clear that DTR needs UCP 2016-11-18 15:25:14 -08:00
John Mulhausen d1c99d64ca Merge pull request #634 from sanscontext/dockerid 
Meta Docker ID topic
 2016-11-18 14:49:09 -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
Joao Fernandes 9e83ad894b Merge pull request #651 from joaofnfernandes/release-notes-tags 
Update DTR release notes
 2016-11-18 14:35:46 -08:00
Joao Fernandes 6c50838c90 Update DTR release notes 2016-11-18 14:29:43 -08:00
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
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 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