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

3132 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Gordon Shankman
a7cdecf69c Added exclusion of docker-* packages during yum update in RedHat provisioning. This avoids accidental upgrade of docker when it is already installed. 
Signed-off-by: Gordon Shankman <gshankman@gmail.com>
 2016-12-15 15:42:48 -05:00
Nathan LeClaire
4e3dd8ff81 Merge pull request #3918 from shaynewang/master 
Added canada-central-1 AMI image
 2016-12-13 15:32:33 -08:00
Shayne Wang
8ce6b6e799 Added canada-central-1 AMI image 
AMI source: 099720109477/ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-20161013

Signed-off-by: Shayne Wang <shaynexwang@gmail.com>
 2016-12-12 10:35:55 -08:00
Nathan LeClaire
735741f76f Merge pull request #3911 from nathanleclaire/bump_go_1.7.4 
Bump Go version to 1.7.4
 2016-12-08 17:56:44 -08:00
Nathan LeClaire
0871c925b0 Bump Go version to 1.7.4 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-12-08 14:33:19 -08:00
Nathan LeClaire
57aeabb11a Merge pull request #3910 from nathanleclaire/fix_config_cert_path 
Fix 'docker-machine config' cert paths
 2016-12-07 14:52:21 -08:00
Nathan LeClaire
7118884f78 Merge pull request #3891 from andrestc/apt-get-lock 
libmachine/provision: wait for apt-get update lock
 2016-12-07 14:22:27 -08:00
Nathan LeClaire
d8884192a2 Fix 'docker-machine config' cert paths 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-12-07 14:19:20 -08:00
Nathan LeClaire
bf08cd61ad Merge pull request #3888 from twang2218/update-google-ubuntu 
Update GCE and Rackspace default image to Ubuntu 16.04
 2016-12-02 13:42:35 -08:00
Tao Wang
c0e800cca1 Update GCE and Rackspace default image to Ubuntu 16.04 
Signed-off-by: Tao Wang <twang2218@gmail.com>
 2016-12-02 15:30:11 +11:00
Nathan LeClaire
8c97379cf0 Merge pull request #3889 from twang2218/cleanup-google-driver 
Remove unused upstart commands left in GCE driver.
 2016-12-01 16:17:30 -08:00
Nathan LeClaire
01c8c419e1 Merge pull request #3890 from twang2218/rackspace-add-env-and-default-region 
Add several EnvVars and a default region for Rackspace driver
 2016-12-01 16:16:38 -08:00
André Carvalho
636d7988c0 provision/utils: minor refactoring 
Signed-off-by: André Carvalho <asantostc@gmail.com>
 2016-11-26 12:26:49 -02:00
André Carvalho
122f761911 provision: properly handle apt-get lock error 
Signed-off-by: André Carvalho <asantostc@gmail.com>
 2016-11-26 12:11:56 -02:00
André Carvalho
38b4df4183 libmachine/provision: wait for apt-get update lock 
Signed-off-by: André Carvalho <asantostc@gmail.com>
 2016-11-25 15:30:00 -02:00
Tao Wang
f5e9381d43 Add several EnvVars and a default region for Rackspace driver 
Signed-off-by: Tao Wang <twang2218@gmail.com>
 2016-11-25 04:40:01 +11:00
Tao Wang
16a41453b6 Remove unused upstart commands left in GCE driver. 
Signed-off-by: Tao Wang <twang2218@gmail.com>
 2016-11-25 04:35:17 +11:00
Nathan LeClaire
bb37dc7806 Merge pull request #3887 from andrestc/close-rpc 
Close plugin binary even when driver server fails
 2016-11-21 16:40:29 -08:00
André Carvalho
02428eeb06 libmachine/drivers/rpc: close plugin binary even when driver server fails 
With this commit the RPC client driver tries closing the plugin binary
even when closing the driver server fails. This prevents the driver
process from entering in <defunct> state when it failed before closing.

Signed-off-by: André Carvalho <asantostc@gmail.com>
 2016-11-21 14:31:22 -02:00
Nathan LeClaire
23ae71164f Merge pull request #3870 from classmarkets/coreos-dockerd-args 
provision/coreos: start docker 1.12 correctly
 2016-11-16 15:33:52 -08:00
Nathan LeClaire
2b352ca045 Merge pull request #3798 from u-foka/feature/custom-share-virtualbox 
New option for virtualbox driver to set custom shared folder
 2016-11-16 15:29:00 -08:00
Peter Schultz
292e371a46 libmachine/versioncmp: ignore pre-release suffixes 
Signed-off-by: Peter Schultz <peter.schultz@classmarkets.com>
 2016-11-16 10:57:38 +01:00
Peter Schultz
d1a3369490 libmachine/versioncmp: refactor test to be table driven 
Signed-off-by: Peter Schultz <peter.schultz@classmarkets.com>
 2016-11-16 10:57:38 +01:00
Peter Schultz
2ec1b7288f libmachine/versions: rename to versioncmp 
Signed-off-by: Peter Schultz <peter.schultz@classmarkets.com>
 2016-11-16 10:57:38 +01:00
Peter Schultz
c9d26abc4e libmachine/provision: add test for DockerClientVersion 
Signed-off-by: Peter Schultz <peter.schultz@classmarkets.com>
 2016-11-16 10:57:38 +01:00
Peter Schultz
a0378e4ce3 provision/coreos: Fix Docker version detection 
Parse the output of `docker --version` on the remote host instead of
looking for a program named dockerd.

Making decisions based on the presence or absence of a particular
program is short sighted; there are many reasons why dockerd may or may
not exist in $PATH that have nothing to do with the Docker version.

Signed-off-by: Peter Schultz <peter.schultz@classmarkets.com>
 2016-11-16 10:57:03 +01:00
Nathan LeClaire
6228e1b591 Merge pull request #3877 from nathanleclaire/bump_go_1.7.3 
Bump Go version
 2016-11-15 17:43:28 -08:00
Nathan LeClaire
291673edfe Merge pull request #3876 from nathanleclaire/migrate_to_dockerd 
Update provisioner to use dockerd
 2016-11-15 17:43:09 -08:00
Nathan LeClaire
1a878477dd Merge pull request #3873 from nathanleclaire/fix_scp_host 
Fix improper use of IP in generateLocationArg
 2016-11-15 17:42:27 -08:00
Nathan LeClaire
59d3beb201 Fix improper use of IP in generateLocationArg 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-11-15 17:35:34 -08:00
Nathan LeClaire
a21d592d3d Bump Go version 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-11-15 17:28:56 -08:00
Nathan LeClaire
769e2cf79a Merge pull request #3874 from nathanleclaire/fix_err_lint 
Fix golint errors
 2016-11-15 17:21:26 -08:00
Nathan LeClaire
19973f2b1b Fix golint errors 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-11-15 17:14:17 -08:00
Nathan LeClaire
7ed0198985 Update provisioner to use dockerd 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2016-11-15 16:08:02 -08:00
Eisenberger Tamas
9ae513098f Make gofmt happy 
Signed-off-by: Eisenberger Tamas <tamas@eisenberger.hu>
 2016-11-15 08:17:27 +01:00
Eisenberger Tamas
6408bf7f05 New option for virtualbox driver to set custom shared folder 
Signed-off-by: Eisenberger Tamas <tamas@eisenberger.hu>
 2016-11-15 07:25:56 +01:00
Peter Schultz
0eb826382c provision/coreos: start docker 1.12 correctly 
Signed-off-by: Peter Schultz <peter.schultz@classmarkets.com>
 2016-11-14 14:16:50 +01:00
Nathan LeClaire
32185d47d2 Merge pull request #3866 from andrestc/core-drivers-slice 
libmachine: initiliaze core drivers as slice instead of array
 2016-11-11 11:28:06 -08:00
André Carvalho
bdc4af7f1f libmachine: initiliaze core drivers as slice instead of array 
Signed-off-by: André Carvalho <asantostc@gmail.com>
 2016-11-11 13:47:14 -02:00
Nathan LeClaire
6253938ca8 Merge pull request #3761 from v4n/master 
[Digital Ocean] Add ability to speicify the private SSH key path
 2016-11-03 11:03:36 -07:00
v4n
50cc9e51f9 Digital Ocean] Add ability to speicify the private SSH key path 
Signed-off-by: ΛNDΓΕ <andre@vyanes.com>
 2016-11-01 15:15:25 -07:00
Nathan LeClaire
35976d1a49 Merge pull request #3779 from mrburrito/aws-user-data 
Add an option for configuring custom userdata script for the amazonec2 driver.
 2016-11-01 14:38:30 -07:00
Gordon Shankman
c57f88e62d Removing snake_case variable io_err -> ioerr 
Signed-off-by: Gordon Shankman <gshankman@gmail.com>
 2016-11-01 13:12:47 -04:00
Nathan LeClaire
f1fa9c487b Merge pull request #3799 from mrburrito/aws-iam-roles 
Update AWS Credentials lookup to use AWS default provider chain.
 2016-10-31 09:42:53 -07:00
Nathan LeClaire
befce21733 Merge pull request #3854 from hairyhenderson/arch-upgrade-fix-3853 
Fixing syntax for upgrade action on Arch Linux provisioner
 2016-10-31 09:42:01 -07:00
Dave Henderson
678f729fa0 Fixing syntax for upgrade action on Arch Linux provisioner 
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
 2016-10-28 21:23:38 -04:00
Nathan LeClaire
a6f19fa738 Merge pull request #3839 from s-koba/2046-env-add-api-ver 
Add DOCKER_API_VERSION to env
 2016-10-28 13:54:05 -07:00
Nathan LeClaire
64884e844a Merge pull request #3849 from joaofnfernandes/remove-jenkinsfile 
Removes Jenkinsfile used for docs CI
 2016-10-28 13:47:34 -07:00
Nathan LeClaire
786c931de9 Merge pull request #3847 from tolbrino/tb/fix_ssh_key_perms_freebsd 
Fix ssh keyfile permissions on FreeBSD
 2016-10-28 13:47:16 -07:00
Nathan LeClaire
77dd8e49ee Merge pull request #3852 from kad/improve-error 
Improve error message if driver binary not available
 2016-10-28 13:46:25 -07:00