Commit Graph

2801 Commits

Author SHA1 Message Date
Nathan LeClaire 6b0b02fa83 Merge pull request #3301 from nathanleclaire/bump_go_1.6.1
Bump to Golang 1.6.1
2016-04-13 11:30:15 -07:00
Nathan LeClaire 4de87fd7fa Bump to Golang 1.6.1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-13 11:12:57 -07:00
Nathan LeClaire 285b7e5165 Merge pull request #3296 from mmalchuk/master
Correct error handling for external SSH client
2016-04-12 17:24:38 -07:00
Nathan LeClaire 7b62127404 Merge pull request #3300 from ahmetalpbalkan/azure-deps
azure: Update SDK dependencies for better error messages
2016-04-12 12:16:07 -07:00
Ahmet Alp Balkan a6bc7579b7
azure: Update SDK dependencies for better error messages
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-04-12 10:10:09 -07:00
Maksim Malchuk be8f469a82 Correct error handling for external SSH client
In some cases, (e.g. private key not accessible or has incorrect
permissions) docker-machine failed with error "Something went wrong
running an SSH command!". This commit will add the correct debug
messages and show the correct errors for the bad private keys.
Also, due to incorrect handling POSIX file permissions in Windows
some checks should be ignored.

Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
2016-04-12 11:43:18 +03:00
Nathan LeClaire bcc976ac79 Merge pull request #3295 from nathanleclaire/swarm_no_hostnet
Run Swarm containers without --net host
2016-04-11 16:32:34 -07:00
Nathan LeClaire 618201c116 Run Swarm containers without --net host
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-11 16:23:00 -07:00
Nathan LeClaire e1a07a342f Merge pull request #3294 from nathanleclaire/revert_stat_error
Revert "Correct error handling for external SSH client"
2016-04-11 15:57:25 -07:00
Nathan LeClaire d1c9342c42 Merge pull request #3289 from mrbuk/master
VMware Fusion: static ip addresses (dhcp) are evaluated
2016-04-11 15:27:07 -07:00
Nathan LeClaire f4d772f758 Revert "Correct error handling for external SSH client"
This reverts commit f2acfa9492.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-11 15:19:43 -07:00
Nathan LeClaire 1766abc8c5 Merge pull request #3276 from tmds/master
azure.md: extend documentation of command line options
2016-04-11 15:15:11 -07:00
Nathan LeClaire 22a1044075 Merge pull request #3290 from mmalchuk/master
Disable user-defined ssh_config configurations
2016-04-11 15:14:23 -07:00
Tom Deseyn 3dc8a7bdc5 azure.md: Improve documentation based on feedback
Signed-off-by: Tom Deseyn <tom.deseyn@gmail.com>
2016-04-10 20:42:44 +02:00
Maksim Malchuk d14cfaacfc Disable user-defined ssh_config configurations
Using the user-defined ssh_config configurations bring more problems
instead of enchancements.

Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
2016-04-10 20:27:06 +03:00
Markus Bukowski fb4b50112d VMware Fusion: static ip addresses (dhcp) are evaluated
Signed-off-by: Markus Bukowski <me@mrbuk.de>
2016-04-10 18:46:36 +02:00
Nathan LeClaire d6c595f85e Bump version to v0.7.0-rc3
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-07 19:56:46 -07:00
Nathan LeClaire f6f812a95e Merge pull request #3275 from nathanleclaire/fix_rc_version_mismatch
Fix RC version mismatch bug
2016-04-07 19:49:41 -07:00
Nathan LeClaire 2ecc55937c Fix RC version mismatch bug
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-07 15:49:03 -07:00
Tom Deseyn c1904a1729 azure.md: extend documentation of command line options
Improve doc of azure-subnet-prefix, azure-use-private-ip and
azure-no-public-ip options.
https://github.com/docker/machine/issues/3249

Signed-off-by: Tom Deseyn <tom.deseyn@gmail.com>
2016-04-05 06:14:08 +02:00
Nathan LeClaire 5b4159d0d8 Merge pull request #3266 from bamarni/patch-1
[doc] typo in generic driver
2016-04-04 18:41:20 -07:00
Nathan LeClaire bc54d366d5 Merge pull request #3269 from ahmetalpbalkan/azure_msg
azure: more accurate messages for resources created
2016-04-04 17:30:17 -07:00
Nathan LeClaire 1f27895379 Merge pull request #3265 from bamarni/issue-3262
[DigitalOcean] Fix missing identity file error
2016-04-04 17:30:00 -07:00
Nathan LeClaire 60dbecbbd5 Merge pull request #3272 from nathanleclaire/release_v-0.7.0-rc2_bump
Bump version and modify release script for 0.7.0-rc2
2016-04-04 15:39:58 -07:00
Nathan LeClaire 29bd4dbf09 Bump version and modify release script for 0.7.0-rc2
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-04 15:39:05 -07:00
Nathan LeClaire 9b04627c81 Merge pull request #3273 from nathanleclaire/activate_rc_auto_download
Make boot2docker RC download work for Machine RCs
2016-04-04 15:38:09 -07:00
Nathan LeClaire 49d8473288 Make boot2docker RC download work for Machine RCs
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-04-04 12:32:54 -07:00
Ahmet Alp Balkan 6c3faf7d05 azure: more accurate messages for resources created
Addresses #3250. We now print 'Configuring' instead of
'Creating' for upsert operations.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-04-03 17:23:29 -07:00
Bilal Amarni f8640357c3 [doc] typo in generic driver
Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2016-04-02 16:11:55 +02:00
Bilal Amarni 3e3138fcd7 [DigitalOcean] Fix missing identity file error
When using the --digitalocean-ssh-key-fingerprint flag, no SSH key pair
is generated. Keeping the driver's SSHKeyPath option empty makes sure
the ssh client won't perform any validation on the private key.

Signed-off-by: Bilal Amarni <bilal.amarni@gmail.com>
2016-04-02 09:46:19 +02:00
Olivier Gambier 5b9663f896 Merge pull request #3260 from nathanleclaire/remove_coverage_send
Remove coverage-send (buggy) from Travis build
2016-03-31 13:57:58 -07:00
Nathan LeClaire f9dd2f5c97 Remove coverage-send (buggy) from Travis build
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-03-31 12:24:21 -07:00
Nathan LeClaire 7f5eeb9a9f Merge pull request #3252 from ahmetalpbalkan/azure-improv
driver/azure: Performance improvements
2016-03-31 10:52:49 -07:00
Victoria c43988594f Merge pull request #3259 from londoncalling/docs-fix-ocean-example-3257
fixed typos which were referencing the wrong example machines
2016-03-31 09:26:05 -07:00
Victoria Bialas 5d92f351de fixed typos which were referencing the wrong example machnines
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-03-31 08:38:52 -07:00
Ahmet Alp Balkan 8a0e6946b5 driver/azure: atomic write for tenant ID file
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-30 13:14:50 -07:00
Ahmet Alp Balkan 500d7d20c5 driver/azure: Performance improvements
Making Azure operation polling intervals more frequent to
detect completions faster (and thus making machine creations
faster).

Reduce one Azure API call for each machine command by caching
the discovered Azure Active Directory tenant ID of the user’s
Azure subscription into a local file. This also makes Azure
driver commands faster.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-30 12:26:23 -07:00
Ahmet Alp Balkan ec99e2b16f Update azure dependencies
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
2016-03-30 12:07:50 -07:00
Nathan LeClaire 51fb3f0c0c Merge pull request #3251 from jsirois/jsirois/driver/test_flags
Add a test for create command flag handling.
2016-03-30 10:52:29 -07:00
John Sirois 5f802ce66c Add a test for create command flag handling.
This complements the fix in 705865fa by adding a test for unset flags
with defaults as well as other combinations of set and unset flags.

Signed-off-by: John Sirois <john.sirois@gmail.com>
2016-03-30 11:31:56 -06:00
Nathan LeClaire 88827d3324 Merge pull request #3243 from tpires/3141_fix_check_docker_running
FIX #3141 Refactor netstat command and tests
2016-03-29 14:40:58 -07:00
Nathan LeClaire 9c645cb823 Merge pull request #3245 from jsirois/jsirois/issues/3242
Fixup create command flag application.
2016-03-29 14:37:09 -07:00
Nathan LeClaire 90b4c3895d Merge pull request #3235 from mmalchuk/master
Correct error handling for external SSH client
2016-03-29 14:36:37 -07:00
John Sirois 705865fa70 Fixup create command flag application.
Previously StringSlice flag defaults were not respected.  These use
special handling and that handling did not take account of default
values, always over-writing them.  Expand the CommandLine interface to
take advantage of the underlying codegansta/cli.Context IsSet method and
guard default string slice overwrites with an IsSet test.

Signed-off-by: John Sirois <john.sirois@gmail.com>
2016-03-29 11:53:22 -06:00
Maksim Malchuk f2acfa9492 Correct error handling for external SSH client
In some cases, (e.g. private key not accessible or has incorrect
permissions) docker-machine failed with error "Something went wrong
running an SSH command!". This commit will add the correct debug
messages and show the correct errors for the bad private keys.

Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
2016-03-29 03:32:00 +03:00
Tiago Pires a6f19ef936 FIX #3141 Refactor netstat command and tests
Updated `netstat` command to minimize its output with `-t` and `-l`
flags.
Refactored regex on `libmachine/provision/utils.go`:`checkDaemonUp` to
avoid `matchNetstatOut` returning `true` when remote machine has a
similar port to dockerPort listening (e.g. dockerPort := 2376 and
remote machine has port 23760 listening).
Refactored `utils_test.go` with more accurate `netstat` output.

Signed-off-by: Tiago Pires <tandrepires@gmail.com>
2016-03-28 23:29:26 +01:00
Nathan LeClaire 0d58079bf5 Merge pull request #3233 from AndreLouisCaron/env-silent-in-cmd
Silences docker-machine env command on Windows.
2016-03-28 11:55:39 -07:00
Andre Caron b85531506a Silences docker-machine env command on Windows.
Signed-off-by: Andre Caron <andre.l.caron@gmail.com>
2016-03-25 09:03:53 -04:00
Nathan LeClaire 8141874120 Merge pull request #3230 from nathanleclaire/bump_v0.7.0-rc1
Add changes for 0.7.0-rc1
2016-03-24 13:17:31 -07:00
Nathan LeClaire 751cdcea27 Add changes for 0.7.0-rc1
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-03-24 12:47:06 -07:00