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

110 Commits

Author SHA1 Message Date
Nathan LeClaire
8ba5a57072 Revert "Merge pull request #1552 from ehazlett/b2d-next" 
This reverts commit 736ebb14fb, reversing
changes made to c6660bf62c.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-08-03 14:46:52 -07:00
Evan Hazlett
1469b3b704 Merge pull request #1612 from skatsuta/empty-dockerhost-active 
libmachine: Filestore#GetActive() should return an error if DOCKER_HOST is empty
 2015-07-31 05:15:08 -07:00
Evan Hazlett
a51e4aaf5d Merge pull request #1620 from skatsuta/fix-hostname-test 
libmachine: fix a test to check a host name is the same as expected
 2015-07-31 05:05:58 -07:00
Soshi Katsuta
3f41f8ac4c libmachine: fix a test error message to show an expected host name 
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
 2015-07-31 16:38:00 +09:00
Soshi Katsuta
c8987830b9 libmachine: fix a test to check the host name is right 
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
 2015-07-31 16:37:46 +09:00
Soshi Katsuta
47a890f27f libmachine: change an error message in Filestore#GetActive() 
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
 2015-07-31 16:05:54 +09:00
Evan Hazlett
751e80eefd Merge pull request #1597 from nathanleclaire/ls_timeout 
Add Timeout state to ls command
 2015-07-30 17:54:28 -07:00
Nathan LeClaire
e9c285cf6a Add Timeout state to ls command 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-07-30 13:44:40 -07:00
Soshi Katsuta
aba294cbb1 libmachine: return an error if DOCKER_HOST is empty 
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
 2015-07-30 19:50:08 +09:00
Evan Hazlett
7614212d4f Merge pull request #1564 from nathanleclaire/revert_migration 
Revert configuration migration removal, include new version field, and introduce migration boilerplate
 2015-07-29 16:50:49 -07:00
Nathan LeClaire
802393f253 Skip and warn on wonky /etc/os-release lines 
If the lines don't split cleanly (occasionally STDERR gets mixed in, for
instance, due to our current SSH output setup), we should simply
log.Warn in the output instead of bailing completely.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-07-28 18:07:51 -07:00
Nathan LeClaire
fb2e843e99 - Re-introduce config migration; fix panics occurring from older configs 
- Introduce boilerplate for config.json migrations

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-07-28 15:38:16 -07:00
Evan Hazlett
736ebb14fb Merge pull request #1552 from ehazlett/b2d-next 
VirtualBox: Update to support new B2D
 2015-07-24 18:20:42 -04:00
Evan Hazlett
65b5624221 proper check for hyper-v during upgrade 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-07-24 13:33:46 -04:00
Evan Hazlett
030783af74 swarm: use --advertise instead of --addr for join 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-07-24 13:15:00 -04:00
Evan Hazlett
5af751ecf1 b2d: re-enable upgrade for local 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-07-24 09:38:01 -04:00
Evan Hazlett
cb80c434ac b2d: use direct urls until release; devicemapper for engine opts tests 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

b2d-ng: use driver names for iso versions

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-07-24 09:07:01 -04:00
Evan Hazlett
e09f2fdd9c vbox: change to get latest released iso instead of pre-release 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: fix windows share dir for homedir

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: update tests for b2d

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-07-24 09:07:01 -04:00
Evan Hazlett
ab31d52165 update vbox driver to work with new b2d 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: lock down shared folders to user home dir

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

use env var for user for cross platform

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

vbox: remove sudo from setting ssh key for user

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>

wip: use homedir for share

Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-07-23 19:40:07 -04:00
Evan Hazlett
b43a76deec add GetOsReleaseInfo to provisioner to assist in testing; add tests for rpm repo 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-07-22 20:56:28 -04:00
Evan Hazlett
01bf2ea2d7 use yum repos for redhat like distros 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-07-22 20:56:27 -04:00
Nathan LeClaire
79b9450fef Revert "Remove flat (0.1.0) => nested (0.2.0) migration code" 
This reverts commit 2f831887c6.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-07-22 11:22:33 -07:00
Ryan Grothouse
d553a2c757 added support for setting environment variables in docker engines 
Signed-off-by: Ryan Grothouse <rgrothouse@gmail.com>
 2015-07-16 16:12:06 -04:00
Evan Hazlett
f8456d8bba Merge pull request #1494 from nathanleclaire/rename_machine_to_provider 
Rename libmachine.Machine to libmachine.Provider
 2015-07-11 20:33:22 -06:00
Emmanuel Bretelle
36ec026b38 [debian] Make enabling docker service work 
Fixes #1495
/etc/systemd/system/docker.service was missing the [Install] section
making the enable action fail with:

```
root@jessie:~# systemctl enable docker
Synchronizing state for docker.service with sysvinit using
update-rc.d...
Executing /usr/sbin/update-rc.d docker defaults
Executing /usr/sbin/update-rc.d docker enable
The unit files have no [Install] section. They are not meant to be
enabled
using systemctl.
Possible reasons for having this kind of units are:
1) A unit may be statically enabled by being symlinked from another
unit's
   .wants/ or .requires/ directory.
2) A unit's purpose may be to act as a helper for some other unit which
has
   a requirement dependency on it.
3) A unit may be started when needed via activation (socket, path,
timer,
   D-Bus, udev, scripted systemctl call, ...).
```

Signed-off-by: Emmanuel Bretelle <chantr4@gmail.com>
 2015-07-10 00:10:39 -07:00
Nathan LeClaire
3eaab15a5b Rename libmachine.Machine to libmachine.Provider 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-07-09 10:24:29 -07:00
Evan Hazlett
1620133970 Merge pull request #1263 from nathanleclaire/remove_top_level_migration 
Remove flat (0.1.0) => nested (0.2.0) migration code
 2015-07-08 16:02:35 -06:00
Nathan LeClaire
83a8a4c0f8 Merge pull request #1310 from exoscale/feature/exoscale-multiple-security-groups 
exoscale: ability to specify multiple security groups on instance creation
 2015-07-07 11:22:44 -07:00
Nathan LeClaire
fd35c7df48 Set boot2docker hostname properly 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-07-06 13:11:07 -07:00
Vincent Bernat
4ec3f206b4 exoscale: use StringSlice to specify security groups 
This mean that the option has to be repeated to specify multiple
security groups.

Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch>
 2015-06-30 10:59:23 +02:00
Nathan LeClaire
3064d52b7f Remove upgrade restriction on VMware providers 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-06-18 10:40:49 -07:00
Evan Hazlett
9ed3cb9c86 provisioning: update rpms for 1.7 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-18 12:44:44 -04:00
Evan Hazlett
e37e90939b provisioning: update rpms for RC3 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-15 16:16:16 -04:00
Nathan LeClaire
e91c28fad6 Check for IP to be assigned before returning from Start() 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-06-11 14:02:27 -07:00
Evan Hazlett
4a54559233 Merge pull request #1280 from ehazlett/native-ssh-fix 
fix issue with native ssh; fix tty allocation for redhat
 2015-06-02 16:48:02 -04:00
Evan Hazlett
a879b39902 Merge pull request #1268 from janeczku/waitforssh 
Check that instance has started before polling SSH
 2015-06-02 10:31:01 -04:00
Evan Hazlett
cf0aee9fd7 support specifying swarm image and docker versions 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-01 16:20:56 -04:00
Evan Hazlett
0b5a389481 fix issue with native ssh; fix tty allocation for redhat 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-06-01 10:08:07 -04:00
Jan Broer
c7e9dc7849 libmachine: wait for instance start before polling SSH 
Signed-off-by: Jan Broer <janeczku@yahoo.de>
 2015-05-29 16:54:06 +02:00
Nathan LeClaire
2f831887c6 Remove flat (0.1.0) => nested (0.2.0) migration code 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-28 15:01:55 -07:00
Evan Hazlett
584dec8a74 redhat: use engine version 1.7rc1 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-28 08:51:42 -04:00
Evan Hazlett
be7c110dfd Merge pull request #1247 from ehazlett/redhat-tty-fix 
redhat: fix tty provision bug
 2015-05-27 13:57:44 -04:00
Evan Hazlett
ec5edb0354 redhat: fix tty provision bug 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-27 10:56:43 -04:00
Evan Hazlett
53d0da039a debian: rebase and fix configureSwarm 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-26 17:55:38 -04:00
Evan Hazlett
3e1a6ed98c debian: rebase and streamline sudo install 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-26 17:54:47 -04:00
Evan Hazlett
290ead9ea0 debian: use proper location for config 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-26 17:54:47 -04:00
Evan Hazlett
c318008aea add debian provisioner 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-26 17:54:47 -04:00
Nathan LeClaire
47bd262260 Implement configurable Swarm options 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-26 10:18:34 -07:00
Nathan LeClaire
3385e4ef94 Nitpick struct fields 
I find it easier to identify and read if they are labelled

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-22 14:51:24 -07:00
Evan Hazlett
30ace6716e centos: update config path 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:45:51 -04:00