centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-31 16:28:59 +07:00
Code Issues Packages Projects Releases Wiki Activity
1,009 Commits 54 Branches 28 Tags
fc49adbcdfa1c6985fda170f5cac4fe009dee85d
Commit Graph

1009 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Hazlett
13b66e7956 Merge pull request #570 from bfirsh/docs-improvements 
Simplify introduction to docs
 2015-02-23 09:47:40 -05:00
Ben Firshman
bf3888d94f Simplify docs introduction 
This is going to be the landing page for people finding out about
Machine, so it needs to be to the point.

I don't think this is the right place to explain *why* you need a
Docker daemon.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-23 09:59:27 +00:00
Ben Firshman
27eeb4499a Fix typo in link 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-23 09:58:53 +00:00
Evan Hazlett
843a22488f Merge pull request #579 from SvenDowideit/move-userguide-to-index 
move the userguide to http://docs/machine/
 2015-02-23 00:19:59 -05:00
Sven Dowideit
1dedd15d48 move the userguide to http://docs/machine/ 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-23 14:09:27 +10:00
Evan Hazlett
8abad0e953 Merge pull request #578 from ehazlett/docs-swarm 
remove generate-swarm-token docs
 2015-02-21 16:45:17 -08:00
Evan Hazlett
182dc34367 remove generate-swarm-token docs 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-21 19:44:32 -05:00
Evan Hazlett
0b5299bcf0 Merge pull request #575 from andrewwatson/fix-564-govcerr 
fixes #564 by surfacing govc errors to end user
 2015-02-21 16:32:11 -08:00
Evan Hazlett
772255dd88 Merge pull request #577 from andrewwatson/fix-576-err-return 
Fixes #576 by return the err
 2015-02-21 16:31:37 -08:00
Ray Tsang
64544bd1c0 Add google-scopes option to specify Compute Engine scopes 
Signed-off-by: Ray Tsang <saturnism@gmail.com>
 2015-02-21 17:21:12 -05:00
Andrew Watson
9ff6dbe0b2 Fixes #576 by return the err 
Signed-off-by: Andrew Watson <andrewmoorewatson@gmail.com>
 2015-02-21 00:15:47 -05:00
Andrew Watson
c481442fe0 fixes #564 by surfacing govc errors to end user 
Signed-off-by: Andrew Watson <andrewmoorewatson@gmail.com>
 2015-02-20 20:25:35 -05:00
Evan Hazlett
75e3e8e956 Merge pull request #571 from nathanleclaire/fix_ssh_doc 
Update SSH documentation
 2015-02-20 15:23:01 -08:00
Evan Hazlett
20ffc488f0 Merge pull request #566 from SvenDowideit/add-docker-docs-scafolding 
Add the docs.docker.com build tooling
 2015-02-20 15:17:46 -08:00
Evan Hazlett
53414ded4e Merge pull request #573 from ehazlett/update-godeps 
update godeps (remove swarm discovery dependency)
 2015-02-20 13:51:25 -08:00
Evan Hazlett
04a0d398b2 update godeps (remove swarm discovery dependency) 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-20 13:49:17 -08:00
Evan Hazlett
8a8e429cb1 Merge pull request #464 from ehazlett/swarm 
Swarm Provisioning
 2015-02-20 13:42:11 -08:00
Evan Hazlett
82a686fc7c remove generate-swarm-token command; fix tests; update docs 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-20 13:36:06 -08:00
Evan Hazlett
d017162aba update machine guide for swarm 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-20 13:07:21 -08:00
Evan Hazlett
a48dfd3448 use swarm master also as node 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-20 13:07:21 -08:00
Evan Hazlett
3a3ef6f45e add discovery to machine config; show swarm membership 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-20 13:07:21 -08:00
Evan Hazlett
b908a9e655 use official swarm image 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-20 13:07:21 -08:00
Evan Hazlett
a949e12b6e store swarm config in driver; vendor Godeps; generate swarm token 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-20 13:07:21 -08:00
Evan Hazlett
16e8159503 virtualbox swarm support 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-20 13:07:21 -08:00
Evan Hazlett
b996cb7e9e azure: use IP when calling GetIP for proper certs 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-20 13:07:21 -08:00
Evan Hazlett
730f0dc68c google: configure firewall if swarm master 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-20 13:07:20 -08:00
Evan Hazlett
4e95c2760f authorize swarm port when master is in ec2; fix max dns name for azure 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-20 13:07:20 -08:00
Evan Hazlett
557d03a849 tls fixes to support swarm; test updates; improved provisioning logging 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-20 13:07:20 -08:00
Evan Hazlett
a73deea5d0 swarm provisioning 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-02-20 13:07:20 -08:00
Evan Hazlett
9ea86711ef Merge pull request #559 from LaynePeng/master 
#445-Fix Patch.
 2015-02-20 13:06:28 -08:00
Nathan LeClaire
9d1e3cd040 Update SSH documentation 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-02-20 09:22:29 -08:00
Sven Dowideit
80851aa53b Add the docs.docker.com build tooling 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-20 13:20:54 +10:00
Evan Hazlett
70552f73bd Merge pull request #560 from databus23/fish_env_export 
support for fish shell in env command
 2015-02-19 08:09:19 -08:00
Fabian Ruff
bb1c52ac88 support for fish shell in env command 
Signed-off-by: Fabian Ruff <fabian@progra.de>
 2015-02-19 13:21:54 +01:00
LaynePeng
4fee4925f2 #445-Fix Patch. 
Signed-off-by: LaynePeng <appamail@hotmail.com>
 2015-02-19 14:49:13 +08:00
Evan Hazlett
8a18155d72 Merge pull request #551 from cloudnativeapps/GH-547 
Custom VMware ISO for B2D 1.5.0
 2015-02-18 07:03:14 -08:00
Fabio Rapposelli
13b60b19f7 Updated custom ISOs for B2D w/ vmtoolsd and format-blank-drive patches. 
Signed-off-by: Fabio Rapposelli <frapposelli@vmware.com>
 2015-02-18 11:26:11 +01:00
Evan Hazlett
d674e87813 Merge pull request #545 from nathanleclaire/fix_hyperv_build 
Fix build on master
 2015-02-16 15:13:29 -08:00
Nathan LeClaire
3af411ab90 Add needed test file 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-02-16 15:10:23 -08:00
Evan Hazlett
b8ab9300e1 Merge pull request #453 from nathanleclaire/coverage 
Add structure to generate code coverage representation
 2015-02-16 14:19:01 -08:00
Evan Hazlett
0ad612a2a9 Merge pull request #541 from mbrukman/google-vm-image-update 
Update GCE VM images to latest release versions.
 2015-02-16 14:07:04 -08:00
Misha Brukman
a9e468cf67 Update GCE VM images to latest release versions. 
Signed-off-by: Misha Brukman <mbrukman@google.com>
 2015-02-16 15:15:34 -05:00
Evan Hazlett
dd8a6ce3e2 Merge pull request #543 from cloudnativeapps/GH-431 
Updated Godeps for govcloudair.
 2015-02-16 06:41:21 -05:00
Fabio Rapposelli
8983fb1b6c Updated Godeps for govcloudair. 
Fixes #431

Signed-off-by: Fabio Rapposelli <frapposelli@vmware.com>
 2015-02-16 12:36:46 +01:00
Evan Hazlett
d1b425b210 Merge pull request #528 from SvenDowideit/return-error-even-when-vboxmanage-fails-to 
Detect vboxmanage error conditions and pass those on as errors
 2015-02-12 09:18:47 -05:00
Sven Dowideit
de62c65a71 Detect vboxmanage error conditions and pass those on as errors 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-02-12 08:46:18 +10:00
Evan Hazlett
e26d48ab5b Merge pull request #519 from ehazlett/fix-restart-vbox 
fix bug with attempting to restart vbox instance that is not running
 2015-02-11 13:15:39 -05:00
Evan Hazlett
bfdf2d12c5 Merge pull request #526 from reines/sudo_aptget_upgrade 
Need to sudo to install the package as well as perform update.
 2015-02-11 12:06:01 -05:00
Jamie Furness
d1ccb16a5c Need to sudo to install the package as well as perform update. 
Signed-off-by: Jamie Furness <jamie@jamierf.co.uk>
 2015-02-11 15:35:38 +00:00
Evan Hazlett
9e5a9cff33 Merge pull request #527 from SvenDowideit/add-vbox-robutness 
Detect the location of VBoxManage.exe - it is often not in the PATH
 2015-02-11 09:00:32 -05:00