Commit Graph

275 Commits

Author SHA1 Message Date
Evan Hazlett
e150a93cc5 Merge pull request #393 from radeksimko/rsimko-bin-basepath
Use binary file name instead of full path
2015-01-23 10:28:13 -05:00
Radek Simko
934ae47555 Use binary file name instead of full path
Signed-off-by: Radek Simko <radek.simko@gmail.com>
2015-01-23 15:14:22 +00:00
Evan Hazlett
badf0bffcd Merge pull request #390 from sthulb/rename
Change binary name to docker-machine
2015-01-22 16:19:00 -05:00
Simon Thulbourn
cdeaeb7896 Merge pull request #1 from nathanleclaire/sthulb-rename
Add some misses I found
2015-01-22 20:37:35 +00:00
Nathan LeClaire
14b7e0fe5f Add some misses I found
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-01-22 12:01:40 -08:00
Simon Thulbourn
4ee78fa097 Change binary name to docker-machine
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-22 18:50:08 +00:00
Evan Hazlett
29c1eb9080 Merge pull request #292 from radeksimko/bin_name_fix
Use actual binary name instead of hardcoding it
2015-01-22 12:44:26 -05:00
Evan Hazlett
fd6075463c Merge pull request #380 from ehazlett/bump-version
bump version for 0.1.0
2015-01-21 15:35:32 -05:00
Evan Hazlett
a7c1f44ecb bump version for 0.1.0
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-21 15:33:19 -05:00
Evan Hazlett
95404d4f3b Merge pull request #374 from ehazlett/sl-docs
docs for sl
2015-01-20 16:48:39 -05:00
Evan Hazlett
28dd1693a5 docs for sl
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-20 16:48:00 -05:00
Evan Hazlett
a3e996e1e0 Merge pull request #51 from cpuguy83/add_softlayer
Add softlayer driver
2015-01-20 16:46:02 -05:00
Evan Hazlett
db3343ea70 Merge pull request #255 from ehazlett/standard-tls
Use standard TLS for authentication
2015-01-20 13:12:44 -05:00
Evan Hazlett
e91fa6b447 more docs for machine
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-20 12:21:43 -05:00
Evan Hazlett
54b3e4ddbf updated docs for machine using tls
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-20 12:04:59 -05:00
Evan Hazlett
e1d0c97770 do not autoremove machine on error (prevents removing existing machines)
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-19 13:52:25 -05:00
Brian Goff
b1d1c80a76 Use TLS stuff instead
Thanks @ehazlett

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-01-19 12:32:32 -05:00
Brian Goff
8d8c6fe71d Add softlayer driver
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-01-19 12:29:56 -05:00
Evan Hazlett
f5ba0dc1d7 save IP to vmwarefusion config; google driver cleanup
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-18 03:29:44 -05:00
Radek Simko
13fd5f07a3 Use actual binary name instead of hardcoding it
Signed-off-by: Radek Simko <radek.simko@gmail.com>
2015-01-17 20:13:31 +00:00
Evan Hazlett
c5076f81b1 fixes #289: path issue for windows machine clients
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-16 17:18:30 -05:00
Evan Hazlett
e6de563d62 Merge pull request #1 from nathanleclaire/ehazlett-standard-tls
Correct *.pem names to work with DOCKER_CERT_PATH
2015-01-16 16:59:45 -05:00
Nathan LeClaire
4bc7dc5676 Correct *.pem names to work with DOCKER_CERT_PATH
See https://github.com/docker/docker/blob/master/docker/docker.go#L22

This is how things currently work with b2d.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-01-16 13:56:51 -08:00
Evan Hazlett
0c8ef0abe5 updated tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:25 -05:00
Evan Hazlett
090e3328c8 refactor b2d retrieval for fusion/vbox
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:25 -05:00
Evan Hazlett
3212d0c509 tls for openstack/rackspace
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:25 -05:00
Evan Hazlett
d1ece77684 updated readme for TLS
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:25 -05:00
Evan Hazlett
6d3976053b version bump
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:25 -05:00
Evan Hazlett
fbce999d22 updated godeps; fixed cert issue date bug
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:25 -05:00
Evan Hazlett
e2f579d376 TLS for vsphere
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:25 -05:00
Evan Hazlett
35e0351889 tls support for vcloud air
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
Evan Hazlett
f4cf4ce801 updated integration tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
Evan Hazlett
946db8a08d standard tls for azure; fixed connection issue with azure
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
Evan Hazlett
9664d68889 rebase and updated fusion to work with standard docker b2d 1.4.1
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
Evan Hazlett
fc2e5f278b configure opts for b2d
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
Evan Hazlett
4a47ce01fe updated google driver; added StartDocker and StopDocker to driver
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
Evan Hazlett
4534944f6a use tls for auth
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-15 22:56:24 -05:00
Evan Hazlett
6ea17eee0d Merge pull request #262 from sthulb/panics
Fix for panics when no active host is set
2015-01-15 22:55:43 -05:00
Evan Hazlett
7efdb5a0ca Merge pull request #267 from sthulb/create-oops
Stop machine from overwriting an existing machine
2015-01-15 12:19:32 -05:00
Evan Hazlett
a226849168 Merge pull request #73 from ggiamarchi/openstack-driver
OpenStack & Rackspace drivers
2015-01-15 09:13:06 -05:00
Evan Hazlett
55c3562795 Merge pull request #284 from sthulb/fix-sec-group
change sign to ver 4 to support newer regions
2015-01-15 09:05:31 -05:00
Simon Thulbourn
1d958f5b63 change sign to ver 4 to support newer regions
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-14 23:17:54 +00:00
Guillaume Giamarchi
9d91f458f5 Set machine hostname
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 23:20:23 +01:00
Ash Wilson
e44b840e3a OpenStack driver enhancements
* Log machine creation.
* Typo in an error message 💅
* Shelve docker install output in /var/log.
* Improve the docker installation error message. Also, keep it from interrupting the host creation, so that you can actually run `machine ssh` or `machine rm` on the host afterward.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 23:15:32 +01:00
Guillaume Giamarchi
bb5cf85a7e Assume machine is running Ubuntu when installing docker
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 23:15:32 +01:00
Ash Wilson
cd97f87f6c Add a Rackspace Docker install option.
Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 23:15:32 +01:00
Ash Wilson
c5c15618e8 Allow derived drivers to enable the Docker install.
Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 23:15:26 +01:00
Ash Wilson
5636679367 Rackspace driver enhancements & fixes
* checkConfig is no longer a thing.
* Change the default Rackspace image to Ubuntu 14.04.
* Remove an unnecessary Network service.
* Show a nicer error when the Region is omitted.

Signed-off-by: Ash Wilson <ash.wilson@rackspace.com>
2015-01-14 23:13:40 +01:00
Guillaume Giamarchi
2332bcc9d8 Add flag --openstack-docker-install
Boolean flag to indicate if docker have to
be installed on the machine. Useful when
docker is already installed and configured
in the OpenStack image. Default set to `true`

Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 23:13:24 +01:00
Guillaume Giamarchi
a2d64fe5c0 Support floating IP allocation and assignation
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 23:11:12 +01:00