Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,082 Commits 1 Branch 72 Tags
1f4502e3e0799384f6d3d21eb7d0df875c76efba
Commit Graph

1082 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Vincent Bernat
1f4502e3e0 docs/exoscale: require port 22 in security group too 
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-05-21 11:05:55 +02:00
Evan Hazlett
bd93f2e9cf Merge pull request #1180 from hairyhenderson/arm-linux-build 
Adding linux/arm to the platforms that get built
 2015-05-19 15:28:35 -04:00
Evan Hazlett
309afd1112 Merge pull request #1175 from hairyhenderson/add-machine-name-envvar-925 
Adding new DOCKER_MACHINE_NAME environment variable
 2015-05-19 15:28:13 -04:00
Evan Hazlett
c4be46ad03 Merge pull request #1183 from hairyhenderson/softlayer-use-machinename-as-hostname-1003 
Defaulting SoftLayer hostname to machine name
 2015-05-19 09:23:16 -04:00
Dave Henderson
fe4652b21d Defaulting SoftLayer hostname to machine name 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-05-18 16:07:59 -04:00
Evan Hazlett
0c2eeadc8d Merge pull request #1186 from michaellopez/patch-1 
Fixed typo in b2d_migration
 2015-05-18 09:38:45 -04:00
Michael Lopez
d55c1d363b Fixed typo in b2d_migration 
Added missing asterisk
 2015-05-18 14:07:25 +02:00
Dave Henderson
31c1e96e76 Adding linux/arm to the platforms that get built 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-05-15 23:15:40 -04:00
Evan Hazlett
15e022219f Merge pull request #1172 from nathanleclaire/ssh_timeout_fixup 
Move over to real retries method
 2015-05-15 16:14:51 -04:00
Nathan LeClaire
e4785ad879 Move over to real retries method 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-15 10:39:39 -07:00
Evan Hazlett
48c033e271 Merge pull request #1140 from nathanleclaire/new_scp 
Implement docker-machine scp
 2015-05-15 13:21:37 -04:00
Dave Henderson
7b68762d36 Adding new DOCKER_MACHINE_NAME environment variable 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-05-14 22:43:39 -04:00
Evan Hazlett
bc0a552b26 Merge pull request #1162 from hairyhenderson/bats-arm-support 
Naming the binary properly on ARM when running integration tests
 2015-05-14 16:37:42 -04:00
Evan Hazlett
bf8eaea8ac Merge pull request #1096 from ibuildthecloud/rancheros 
Support RancherOS, Fixes #992
 2015-05-14 10:02:30 -04:00
Evan Hazlett
d56cc66274 Merge pull request #1171 from nathanleclaire/fixup_cert_copy 
Fix cert copying bug [URGENT]
 2015-05-14 02:26:56 -04:00
Nathan LeClaire
8afddbeab8 Fix cert copying bug 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-13 22:19:27 -07:00
Nathan LeClaire
333b7e88a7 Implement docker-machine scp 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-13 17:22:42 -07:00
Evan Hazlett
37bfe3a1dd Merge pull request #1166 from ehazlett/amazonec2-instance-profile-env-var 
amazonec2: instance profile env var
 2015-05-13 16:36:28 -04:00
Evan Hazlett
cb6eb6bb77 amazonec2: instance profile env var 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-13 15:00:52 -04:00
Evan Hazlett
29256e907c Merge pull request #1161 from nathanleclaire/cert_fixes 
Fix a few issues with certs
 2015-05-13 11:01:08 -04:00
Evan Hazlett
f29c5fc4dc Merge pull request #1086 from zchee/ec2-add-monitoring-flag 
[EC2] Add Monitoring flag
 2015-05-13 10:49:14 -04:00
Evan Hazlett
e999ebb824 Merge pull request #1129 from ehazlett/easier-env-display 
env: enable easier usage display
 2015-05-13 10:40:07 -04:00
Dave Henderson
2019448f5f Naming the binary properly on ARM when running the BATS tests 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-05-12 20:47:55 -04:00
Nathan LeClaire
7f6d19ff47 Fix a few issues with certs 
- regenerate-certs was busted, because of recent changes I made to
  Provision() method
- checksum was different between local certs and remote certs

This PR fixes both issues and adds tests to verify that both conditions
are checked in the future.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-12 15:11:23 -07:00
Evan Hazlett
00a2f7781f env: enable easier usage display 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-12 08:43:15 -04:00
Evan Hazlett
aec395502e Merge pull request #1125 from hairyhenderson/ls-filter-1076 
Adding --filter flag to ls command
 2015-05-12 08:10:58 -04:00
Evan Hazlett
9c92fd934a Merge pull request #1132 from ehazlett/provisioner-update-package-manager 
provisioner: update metadata before install or upgrade
 2015-05-12 08:09:04 -04:00
Evan Hazlett
68eaa5282d Merge pull request #1152 from hairyhenderson/fix-cli-integration-tests 
Fixing cli.bats tests
 2015-05-12 08:08:20 -04:00
Dave Henderson
a3c8b3474e Adding --filter flag to ls command 
Initially supporting `swarm=`, `state=`, and `driver=` filters.

Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-05-11 20:01:50 -04:00
Evan Hazlett
8ed87c37c2 Merge pull request #1155 from nathanleclaire/engine_opt 
Migrate engine-flag => engine-opt
 2015-05-11 15:43:58 -04:00
Nathan LeClaire
b672617287 Migrate engine-flag => engine-opt 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-11 11:57:09 -07:00
Dave Henderson
96c1d994ec Fixing cli.bats tests 
Signed-off-by: Dave Henderson <Dave.Henderson@ca.ibm.com>
 2015-05-11 09:55:34 -04:00
Evan Hazlett
197e35a021 use var block for updating metadata 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-11 09:44:34 -04:00
Evan Hazlett
b3d39ca81d Merge pull request #1146 from clnperez/log-ssh-err-output 
If there was an SSH error, log the output
 2015-05-11 09:33:03 -04:00
Christy Perez
91d945431f Log ssh command output to Debug 
I struggled to figure out why a machine create was failing, and
eventually asked if anyone else had seen the vague error I was getting:
"Error creating machine: Process exited with: 100. Reason was: ()"

It is immensely helpful if we log the command output instead of
just the rc.

It would also have been useful if the driver providers used the output, but
this covers most scenarios since they don't.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
 2015-05-08 09:35:59 -05:00
Evan Hazlett
08ebaa01d0 Merge pull request #1143 from ibuildthecloud/fix-panic-2 
Fix panic when TCP timeout happens on SSH connect
 2015-05-07 13:57:01 -07:00
Darren Shepherd
30f0273608 RancherOS provisioner 
RancherOS provisioner, tested with VirtualBox and AWS

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-07 13:46:25 -07:00
Darren Shepherd
7013b45dde Avoid panic when stripping empty string 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-07 13:46:25 -07:00
Darren Shepherd
70cc567c46 Refactor DownloadLatestBoot2Docker to make it usable by RancherOS 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-07 13:46:25 -07:00
Darren Shepherd
732ca874b8 Fix panic when TCP timeout happens on SSH connect 
Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-07 13:44:33 -07:00
Evan Hazlett
ccc26904bb Merge pull request #1139 from nathanleclaire/whitespace_nits 
Fix up some whitespace nits
 2015-05-07 13:36:55 -07:00
Evan Hazlett
a3e08a010d Merge pull request #1108 from ibuildthecloud/vbox-sleep 
Fix issue where GetIP in VirtualBox failes due to no SSH
 2015-05-07 13:33:26 -07:00
Evan Hazlett
f3bcda1cff Merge pull request #1137 from nathanleclaire/fixup 
Fix formatting and non-returning of error
 2015-05-07 11:52:40 -07:00
Evan Hazlett
782e3aac11 Merge pull request #1135 from frapposelli/fusion-cpu-fix 
CPU count fixes to `vmwarefusion`
 2015-05-07 11:52:09 -07:00
Nathan LeClaire
9196d3e1d4 Fix up some whitespace nits 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-07 10:12:21 -07:00
Nathan LeClaire
8887ca2fed Fix formatting and non-returning of error 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-06 17:52:29 -07:00
Fabio Rapposelli
13c1006f3b CPU count fixes to vmwarefusion 
- Added `--vmwarefusion-cpu-count` parameter
- Defaults to 1 Virtual CPU

Signed-off-by: Fabio Rapposelli <fabio@vmware.com>
 2015-05-07 02:16:20 +02:00
Evan Hazlett
d97dfa69f9 Merge pull request #1131 from nathanleclaire/ssh_timeout 
Add retries for SSH dial timeout
 2015-05-06 16:13:20 -07:00
Evan Hazlett
6d784fb2fb Merge pull request #1133 from nathanleclaire/fix_upgrade_need_started 
Add check for machine state before upgrade
 2015-05-06 16:10:49 -07:00
Evan Hazlett
7aa8364a4a Merge pull request #1117 from ehazlett/fix-windows-shell-detection 
windows: fix shell detection to not bail on bash envs
 2015-05-06 15:54:37 -07:00