centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-03-31 08:18:55 +07:00
Code Issues Packages Projects Releases Wiki Activity
921 Commits 54 Branches 28 Tags
fcd930ea8f154ece2ef4f63c48eed55e8cf3db81
Commit Graph

921 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Evan Hazlett
fcd930ea8f Merge pull request #1051 from ehazlett/b2d-migration-docs 
Boot2Docker migration docs
 2015-04-24 10:34:48 -07:00
Evan Hazlett
57c70ef0f1 Merge pull request #956 from knarz/golint_vmware 
clean up the vmware drivers
 2015-04-24 09:38:09 -07:00
Evan Hazlett
489dfb304f Merge pull request #1044 from hairyhenderson/ip-chained-args-999 
Enhancing `docker-machine ip` to support multiple host arguments
 2015-04-23 15:03:24 -07:00
Evan Hazlett
8b2047b47a rename doc file 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 15:18:55 -04:00
Evan Hazlett
c00a515f4c update docs for b2d migration 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 15:14:08 -04:00
Evan Hazlett
3f4ce28e15 Merge pull request #979 from ehazlett/b2d-import-disk 
VirtualBox: enable ability to import b2d instances
 2015-04-23 12:09:04 -07:00
Sascha Hanse
6e0aecb2ee clean up the vmware drivers 
Signed-off-by: Sascha Hanse <shanse@gmail.com>

forgot gofmt

Signed-off-by: Sascha Hanse <shanse@gmail.com>
 2015-04-23 20:12:07 +02:00
Evan Hazlett
d881aa8038 b2d import: add migration docs 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 09:38:03 -04:00
Evan Hazlett
e9491d22dc b2d import: move debug logging to debug 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 09:38:03 -04:00
Evan Hazlett
8f66be1bc2 b2d import: split key/val assignment from switch 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 09:38:03 -04:00
Evan Hazlett
33eab99e58 import cpu and memory settings when importing b2d vm 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 09:38:02 -04:00
Evan Hazlett
a01322fa77 fixed ssh generation issue 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 09:38:02 -04:00
Evan Hazlett
7a4e16e082 virtualbox: add ability to import b2d instances 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 09:38:02 -04:00
Evan Hazlett
576951e03a wip: b2d import 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-23 09:38:02 -04:00
Dave Henderson
a0f079a627 Enhancing docker-machine ip to support multiple host arguments 
Fixes #999

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-22 22:10:45 -04:00
Evan Hazlett
5fc9b78b38 Merge pull request #1046 from sthulb/ssh-fix 
Fix for SSH command
 2015-04-22 05:40:18 -07:00
Evan Hazlett
088aeb0b52 Merge pull request #978 from ehazlett/driver-contribution-guidelines 
driver contribution guidelines
 2015-04-22 04:48:01 -07:00
Simon Thulbourn
f1d70a8027 Fix for SSH command 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2015-04-22 11:42:48 +01:00
Evan Hazlett
55a4a7c2f2 Merge pull request #921 from hairyhenderson/inspect-format-template 
Adding --format/-f option to inspect subcommand
 2015-04-21 08:00:54 -07:00
Evan Hazlett
51044b3c3f Merge pull request #909 from sthulb/ssh-client 
SSH Client
 2015-04-21 07:58:39 -07:00
Simon Thulbourn
709b0a84e3 Add SSH client 
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
 2015-04-21 15:37:09 +01:00
Evan Hazlett
191564564e Merge pull request #995 from exoscale/fix/dont-wait-in-drivers 
Don't let drivers wait for SSH/Docker/State
 2015-04-21 07:31:12 -07:00
Evan Hazlett
f64eb09d1c Merge pull request #1034 from frapposelli/fusion-shared-folders 
Update VMware Fusion and vSphere driver to run boot2docker 1.6.0
 2015-04-21 07:22:15 -07:00
Evan Hazlett
57427110a4 Merge pull request #1037 from RickWieman/1032-change-logs-for-unsupported-upgrade 
Moves the 'stopping machine' log below error log
 2015-04-21 05:34:47 -07:00
Rick Wieman
2b269c0b66 Moves the 'stopping machine' log below error log 
Fixes #1032.

Signed-off-by: Rick Wieman <git@rickw.nl>
 2015-04-21 14:18:46 +02:00
Vincent Bernat
9c71e647ed drivers/softlayer: don't let the driver wait for SSH 
Installation of curl is handled directly by libmachine provisioning, so
there is no need to do it and hence wait for SSH to be ready.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-04-21 07:11:41 +02:00
Vincent Bernat
fbb8898914 drivers/google: don't wait for SSH to be ready 
Waiting for SSH is done in libmachine. There are some additional steps
after waiting for SSH but none of them seem to require SSH to be ready
to be executed.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-04-21 07:11:41 +02:00
Vincent Bernat
3440ba64fa drivers/vcloudair: don't test connectivity 
VMWare VCloudAir driver is the only one taking an extra step to test
connectivity after machine creation. If this is a desirable step, it
should be done for all drivers in libmachine directly.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-04-21 07:11:41 +02:00
Vincent Bernat
6f1155c2e7 drivers/openstack: don't let the driver wait for state 
OpenStack driver waits for the machine to reach the expected state. This
is already done in libmachine for most instances of this pattern.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-04-21 07:11:41 +02:00
Vincent Bernat
44be16c49f drivers: don't let the driver wait for SSH/Docker 
Waiting for SSH to start or Docker to be available is a step done
directly in the framework (in libmachine). There is no need for the
driver to do that.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-04-21 07:11:41 +02:00
Dave Henderson
9af46e245f Changing template function name from prettyJSON to prettyjson 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-20 19:49:47 -04:00
Dave Henderson
d40d18f9a8 Making sure all properties are available 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-20 19:27:38 -04:00
Dave Henderson
c93a17481c Adding --format/-f option to inspect subcommand 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-20 19:27:38 -04:00
Dave Henderson
ee41dc36df Adding github.com/stretchr/testify/assert to Godeps 
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2015-04-20 19:27:38 -04:00
Evan Hazlett
4047c97679 Merge pull request #1009 from hairyhenderson/softlayer-remove-sshkey-on-delete-765 
Deleting Machine-generated SSH key from SoftLayer when host is canceled.
 2015-04-20 14:00:24 -07:00
Fabio Rapposelli
25583edbb3 Update VMware Fusion and vSphere driver to run boot2docker 1.6.0 
- Update custom ISO to docker 1.6.0.
- Shared folder support for VMware Fusion.
- Updated bats test for Fusion.

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2015-04-20 10:34:13 -07:00
Evan Hazlett
cade150461 Merge pull request #1013 from zekizeki/master 
Softlayer driver, correctly store provisioned VM IP address
 2015-04-17 08:49:35 -04:00
Evan Hazlett
e8e4197104 Merge pull request #1015 from darron/patch-1 
Follow the redirects.
 2015-04-16 19:41:24 -04:00
darron froese
d9048f3c96 Follow the redirects. 
Otherwise it just errors with:

```
DarronFroeseDD@: docker-machine -v
/usr/local/bin/docker-machine: line 1: syntax error near unexpected token `<'
/usr/local/bin/docker-machine: line 1: `<html><body>You are being <a href="https://s3.amazonaws.com/github-cloud/releases/27494663/a56dd51e-e3cf-11e4-8f5e-ac600ecd75cc?response-content-disposition=attachment%3B%20filename%3Ddocker-machine_darwin-amd64&amp;response-content-type=application/octet-stream&amp;AWSAccessKeyId=AKIAISTNZFOVBIJMK3TQ&amp;Expires=1429217439&amp;Signature=DpwpQR8DBJn1nW6A5C75gXFBF2k%3D">redirected</a>.</body></html>'
```
 2015-04-16 14:52:18 -06:00
Rob Smart
a625106876 Softlayer driver, correctly store provisioned VM IP address 
Fix for Docker Machine gets stuck on IBM Softlayer #915
The ip address of the provisioned VM was not being stored in the driver IPAddress variable, this variable
was being used to check if the VM ssh service was up. However as the variable was a blank string the actual address being checked defaulted
to localhost:22, as a result the installation steps on the VM only worked if the user was running an ssh daemon on the machine they were using docker-machine from.

Signed-off-by: Rob Smart <smartrob@uk.ibm.com>
 2015-04-16 13:21:09 +01:00
Evan Hazlett
6ab5088d1c Merge pull request #965 from nathanleclaire/docs_update 
Update docs with better install instructions
 2015-04-16 01:27:50 -04:00
Nathan LeClaire
ea8402d6f5 Bump to new version 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-04-16 00:14:12 -05:00
Nathan LeClaire
f0265903d1 Update docs with better install instructions 
There are a few minor fixes and enhancements for things thrown in, too.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-04-16 00:01:57 -05:00
Evan Hazlett
0a862a725e Merge pull request #1010 from ehazlett/changelog 
update changelog with 0.2.0 release date
 2015-04-16 00:34:04 -04:00
Evan Hazlett
ede0ef213c update changelog with 0.2.0 release date 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-04-16 00:32:44 -04:00
Evan Hazlett
7f24584581 Merge pull request #998 from fredlf/adds-release-notes 
Adds release notes for upcoming 1.6 release
 2015-04-16 00:22:54 -04:00
Dave Henderson
64a844071d Deleting Machine-generated SSH key from SoftLayer when host is canceled. 
All the other drivers seem to do this, so I can't imagine this is a bad
idea ;)

Fixes #765

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-15 20:37:24 -04:00
Evan Hazlett
3e0477e14c Merge pull request #923 from hairyhenderson/refactor-split-subcommands 
Refactoring commands.go into new commands package
 2015-04-15 19:19:51 -04:00
Dave Henderson
53ef9d7477 Refactoring commands.go into new commands package, with separate file for each subcommand 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-04-15 19:04:44 -04:00
Evan Hazlett
ccf174e7f7 Merge pull request #1006 from hairyhenderson/ssh-fewer-retries 
Reducing the number of SSH connection attempts
 2015-04-15 12:28:38 -04:00