Commit Graph

32 Commits

Author SHA1 Message Date
Damien DUPORTAL 63fb06cd0b Change markdowns tags to not met git conflicts markers accidentaly
Adding a validating script for git conflict marks

Moving to Github flavored markdown titles

Signed-off-by: Damien DUPORTAL <damien.duportal@gmail.com>
2015-01-26 15:16:11 +01:00
Evan Hazlett 6522431978 Merge pull request #378 from stefanfoulis/patch-1
correct typos in readme
2015-01-23 20:30:59 -05:00
Stefan Foulis ba794f55dd
correct typos in readme 2015-01-24 01:55:31 +01: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
Brian Goff 8d8c6fe71d Add softlayer driver
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-01-19 12:29:56 -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
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 edec8cd024 OpenStack & Rackspace driver documentation
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 23:11:12 +01:00
Guillaume Giamarchi f6b0c81996 Add OpenStack driver
Signed-off-by: Guillaume Giamarchi <guillaume.giamarchi@gmail.com>
2015-01-14 22:01:31 +01:00
Simon Thulbourn a70e8462cb adds support for AWS IAM roles
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-13 18:16:43 +00:00
Fabio Rapposelli 6d394e3111 Doc fix for vSphere driver.
Signed-off-by: Fabio Rapposelli <frapposelli@vmware.com>
2015-01-09 10:37:12 +01:00
Fabio Rapposelli 95e3664977 Updated README with instructions for VMware drivers.
Signed-off-by: Fabio Rapposelli <frapposelli@vmware.com>
2015-01-08 11:42:26 +01:00
Ray Tsang 5ff0c28c74 Updated Google Compute to Google Compute Engine
Signed-off-by: Ray Tsang <saturnism@gmail.com>
2015-01-05 20:44:58 -05:00
Evan Hazlett ffd14c6b05 Merge pull request #208 from ehazlett/readme-docker-1.4.1
update readme with links to docker 1.4.1 identity build
2015-01-02 19:29:23 -05:00
Evan Hazlett e352a4c591
update readme with links to docker 1.4.1 identity build
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-02 19:29:05 -05:00
Evan Hazlett 0ab3bfa07b
add env vars for google driver; add google instructions to docs
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-01 10:39:01 -05:00
Ben Firshman 37662736a7 Merge pull request #123 from ehazlett/integration-tests
Integration tests
2014-12-31 17:36:08 +00:00
Nathan LeClaire 37d358810e Add console highlighting to README
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2014-12-30 10:52:37 -08:00
Evan Hazlett b59d41b36b added test docs to readme; add doc info to tests
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2014-12-30 12:59:31 -05:00
Ben Firshman 0724b4620f Remove me from readme
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-12-30 11:16:00 +00:00
Nathan LeClaire 74d1b73083 Add instructions about build script to README
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2014-12-19 11:51:34 -08:00
Evan Hazlett 888181245e use vpc-id and zone instead of subnet-id for ec2
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2014-12-15 22:38:57 -05:00
Evan Hazlett 909e69baff initial work on aws for machine; huge thanks to @nathanleclaire for the
initial implementation

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2014-12-12 17:00:57 -05:00
Ben Firshman ed5c3f62cf Link to GitHub release in readme
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-12-09 16:13:49 -08:00
Nicolas De loof 2c11b726af Azure provider uses .pem file to authenticate
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2014-12-09 08:36:46 +01:00
Ben Firshman 6e27d2de18 Remove go get from build instructions
No we're building inside Docker, you don't need a GOPATH

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-12-08 17:48:48 -08:00
Ben Firshman e42afabd03 Build and test using Docker
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-12-08 16:46:40 -08:00
Ben Firshman 0743eb5475 Add Travis badge and IRC channel to readme
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-12-08 13:13:23 -08:00
Ben Firshman 22478c1336 Document build process
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-12-04 20:28:53 +01:00
Ben Firshman 85eca56e92 Fix typo
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-12-04 15:33:44 +01:00
Ben Firshman 2830ed3f55 Add links to preview release
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-12-04 15:13:28 +01:00
Ben Firshman 73d19108bf Initial commit
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2014-12-04 15:05:11 +01:00