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

72 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
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
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
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
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
fd35c7df48 Set boot2docker hostname properly 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-07-06 13:11:07 -07: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
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
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
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
Evan Hazlett
065982b7d2 centos: add provisioner 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:45:51 -04:00
Evan Hazlett
cab167c21a fedora: remove configure repo 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:45:51 -04:00
Evan Hazlett
8e9ce9ccdf fedora: provisioner based off of redhat 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:45:49 -04:00
Evan Hazlett
7998852368 fedora: use proper location for config file 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:44:40 -04:00
Evan Hazlett
b4fa9f10a8 fedora: remove configure repo 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:44:40 -04:00
Evan Hazlett
f17556b2fa fedora: provisioner based off of redhat 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:44:40 -04:00
Evan Hazlett
bf7a5f2f53 redhat: remove aws check; update docs 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:44:40 -04:00
Evan Hazlett
380aaa2670 redhat: update before docker install; use simpler config in proper location 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:44:40 -04:00
Evan Hazlett
0dbfcd5535 redhat: remove configure repo as we use our own rpms now 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:44:40 -04:00
Evan Hazlett
0920a2de1b redhat: update RPM path 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:44:39 -04:00
Evan Hazlett
ff2c057c96 redhat: use docker RPMs for install 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:44:39 -04:00
Evan Hazlett
c46e7945c5 redhat: install official docker 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:44:39 -04:00
Evan Hazlett
9e9c0f1751 redhat: update for generic provisioner 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:44:39 -04:00
Evan Hazlett
da7ac61be7 redhat: add redhat provisioning 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-21 13:44:37 -04:00
Nathan LeClaire
2f78b7f92a Move code to use SSH "backends" 
Default to shelling out to SSH when available.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-19 15:02:57 -07:00
Evan Hazlett
bf8eaea8ac Merge pull request #1096 from ibuildthecloud/rancheros 
Support RancherOS, Fixes #992
 2015-05-14 10:02:30 -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
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
197e35a021 use var block for updating metadata 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-11 09:44:34 -04: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