Commit Graph

1242 Commits

Author SHA1 Message Date
Evan Hazlett dcf58cfc2d host tests; refactor util functions to support testing
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-02-02 15:44:35 -05:00
Evan Hazlett ba89454ee6 Merge pull request #469 from nathanleclaire/integration_doc
Make note about `MACHINE_BINARY` environment variable.
2015-02-02 15:35:40 -05:00
Nathan LeClaire 3a09516ecb Make note about `MACHINE_BINARY` environment variable.
A user in IRC was confused about this.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-02-02 12:21:57 -08:00
Nathan LeClaire 22eae1296d Fix usage of flag parsing terminator
There is no need to check for "--" manually.  cli will do this for us.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-02-02 12:10:56 -08:00
Evan Hazlett 25b45ffc7d Merge pull request #460 from sthulb/tls-create-later
move cert creation to create command
2015-02-02 13:36:05 -05:00
Simon Thulbourn 3d9f1ed8e8 move cert creation to create commandw
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-02-02 15:41:23 +00:00
Evan Hazlett 55ea356124 Merge pull request #437 from ehazlett/fix-warn-no-internet-b2d
add timeout for b2d release check; warn instead of error if cannot check
2015-02-02 09:11:19 -05:00
Evan Hazlett 5b76400c4d Merge pull request #450 from chanezon/master
added documentation for --azure options
2015-01-31 09:54:55 -05:00
Patrick Chanezon 00ba3fc4bd Merge branch 'master' of https://github.com/chanezon/machine 2015-01-30 13:13:49 -08:00
Patrick Chanezon 7ac6d6f4e5 added documentation for --azure options
Signed-off-by: Patrick Chanezon <patrick@chanezon.com>
2015-01-30 13:13:07 -08:00
Patrick Chanezon df8f3ab4e8 added documentation for --azure options 2015-01-30 11:38:53 -08:00
Evan Hazlett feb34030c2
add timeout for b2d download
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-30 12:41:35 -05:00
Evan Hazlett 447385e1c0 Merge pull request #446 from sthulb/ssh-fix
Use whatever is after -- as the SSH command.
2015-01-30 09:47:58 -05:00
Evan Hazlett 77537b02d0 Merge pull request #422 from sthulb/patch-1
Documents the default images for each driver.
2015-01-30 09:17:26 -05:00
Simon Thulbourn 5c8bd32753 Use whatever is after -- as the SSH command.
Updates the codegansta/cli package.

Change the way commands are detected

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-30 11:11:48 +00:00
Evan Hazlett 875cac692f Merge pull request #438 from Tebro/feature/newMachineMessage
Change message to use machine env.
2015-01-29 18:12:30 -05:00
Richard Weber 183d4be3c4 Change message to use machine env.
Signed-off-by: Richard Weber <riche.weber@gmail.com>
2015-01-30 01:07:42 +02:00
Evan Hazlett 74852ae963 Merge pull request #440 from ehazlett/fix-azure-dns
use hostname for azure instead of generating
2015-01-29 15:04:22 -05:00
Evan Hazlett ac1d69a5fd
updated readme with azure note in DNS; re-name from suggestion by ahmetalpbalkan
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-29 13:23:27 -05:00
Evan Hazlett daa8238a41
use hostname for azure instead of generating
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-29 12:50:47 -05:00
Simon Thulbourn 4e4c619d11 Image docs
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-29 16:09:46 +00:00
Evan Hazlett d1ee81453c
add timeout for b2d release check; warn instead of error if cannot check
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-29 09:15:15 -05:00
Evan Hazlett 7d6fd1f791 Merge pull request #429 from ehazlett/env-command
rename shellinit to env
2015-01-28 13:03:25 -05:00
Evan Hazlett eafc0048f0
rename shellinit to env
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-28 13:01:25 -05:00
Evan Hazlett 62f46b207f Merge pull request #428 from ehazlett/fix-dns-length-azure
fix issue with name and dns length in azure
2015-01-28 12:50:44 -05:00
Evan Hazlett f4342ed4ce
fix issue with name and dns length in azure
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-28 12:47:01 -05:00
Evan Hazlett 071a64eb63 Merge pull request #414 from ehazlett/fix-custom-tls-certs
use correct paths for custom TLS CA cert and key
2015-01-28 12:44:49 -05:00
Evan Hazlett 97aaf4e05d Merge pull request #427 from ehazlett/remove-azure-name
remove name option from azure driver
2015-01-28 11:10:42 -05:00
Evan Hazlett 9b55d4f0a9 Merge pull request #426 from sthulb/virtualbox-state
Remove $ from regexp for Windows users
2015-01-28 11:10:22 -05:00
Evan Hazlett b731c0ea28
remove name option from azure driver
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-28 10:45:32 -05:00
Simon Thulbourn 1727123214 Remove $ from regexp
The GetState() func now works on Windows hosts

Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-28 15:41:47 +00:00
Evan Hazlett 371194ea8c use correct paths for custom TLS CA cert and key
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-27 11:59:59 -05:00
Evan Hazlett c209704f5a Merge pull request #413 from ehazlett/proper-check-for-username
check properly for username on different platforms
2015-01-27 10:35:24 -05:00
Evan Hazlett 720c4edfd2
check properly for username on different platforms
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-27 10:28:55 -05:00
Evan Hazlett d5a4f2f1c4 Merge pull request #402 from ehazlett/single-tls
Update to TLS Certificates
2015-01-26 18:06:43 -05:00
Evan Hazlett d48c0f4157
use server and username for certificate subject and issuer
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-26 17:56:33 -05:00
Evan Hazlett 47bef782fa Merge pull request #401 from ehazlett/ec2-check-existing-keypair
add PreCreateCheck; check for existing ec2 keypair
2015-01-26 12:35:56 -05:00
Evan Hazlett c3e9c58540 Merge pull request #400 from sthulb/ec2-ami
Adds region AMI defaults
2015-01-26 11:44:46 -05:00
Evan Hazlett 57810b298d This adds a method to the Driver: PreCreateCheck. This can be used
where you want to run some prerequisite checks before attempting to
create
the machine.  In the case of EC2, this is a check for an existing
keypair.  This can be used in the other drivers in the future as well.

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-26 11:27:12 -05:00
Evan Hazlett 9df4b0eb34 Merge pull request #384 from ehazlett/use-port-from-docker-url
use port from driver URL when configuring engine
2015-01-26 11:18:44 -05:00
Simon Thulbourn 8482c7201f Adds region defaults
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-26 16:17:18 +00:00
Evan Hazlett a3e114737b fixes #282: use port from driver URL when configuring engine
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-26 11:17:12 -05:00
Evan Hazlett 9178f518e8 Merge pull request #391 from ehazlett/ec2-use-single-sg
Create / Re-use existing EC2 security group
2015-01-26 11:12:18 -05:00
Evan Hazlett 15db306c44 Merge pull request #398 from ehazlett/use-ubuntu-for-base
use ubuntu for base image
2015-01-26 11:11:48 -05:00
Evan Hazlett 38eb438d6b Merge pull request #399 from sthulb/allowed-names
Valid hostname check
2015-01-26 10:42:24 -05:00
Evan Hazlett 421d624c1d Merge pull request #404 from dduportal/git-marker-remove
Quick PR : Change markdowns tags to not met git conflicts markers accidentaly
2015-01-26 10:40:24 -05:00
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 aae6f74f84
use MkdirAll for docker machine config path
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-25 23:43:59 -05:00
Simon Thulbourn 7f708e48c2 Valid hostname check
Signed-off-by: Simon Thulbourn <simon+github@thulbourn.com>
2015-01-24 21:16:21 +00:00
Evan Hazlett d0fd57a1e5
check for .docker dir and create if necessary
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
2015-01-24 15:10:52 -05:00