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

75 Commits

Author SHA1 Message Date
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
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
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
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
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
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
Nathan LeClaire
e152ecc30b Add check for machine state before upgrade 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-06 13:20:33 -07:00
Evan Hazlett
5adfb8b3f0 provisioner: update metadata before install or upgrade 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-06 13:18:46 -07:00
Evan Hazlett
4e64ff79f9 generic: update for upstream driver specification 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2015-05-05 11:04:48 -07:00
Darren Shepherd
8afe967a80 Fix issue where GetIP failes due to no SSH 
The main goal of this patch was to make the VirtualBox driver wait for
SSH before trying to get the IP of the VM.  The generic WaitForSSH
method required a Host struct as an arg.  This patch moves most of the
logic to the driver package so that drivers can call WaitForSSH.  The
existing functions in host are just wrappers to the real
implementation in drivers now.

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-05 09:32:45 -07:00
Darren Shepherd
43b5786001 Default storage driver to "" and let provisioner choose default 
The storage driver will be "" by default an the provisioner must choose
their default provisioner.  If the user chosen storage driver is not
supported the provisioner should return an error.

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-05 09:12:33 -07:00
Evan Hazlett
e4b6ff1ae9 Merge pull request #1103 from nathanleclaire/active_based_on_env 
Read active host from DOCKER_HOST instead of from file
 2015-05-04 18:13:48 -07:00
Nathan LeClaire
c602e69448 Read active host from DOCKER_HOST instead of from file 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-05-04 16:29:04 -07:00
Darren Shepherd
fc4488a864 Refactor out common logic in UbuntuProvisioner 
This change create GenericProvisioner which is the boilplate or
generic Linux functionality that was previously in the UbuntuProvisioner

Signed-off-by: Darren Shepherd <darren@rancher.com>
 2015-05-03 17:21:46 -07:00
Nathan LeClaire
142ffadc2c Refactor logging to focus on simple STDOUT/STDERR 
This also lays the foundation for the possibility of log drivers in the
future, if it is decided that is a direction to pursue.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-04-30 12:04:52 -07:00
Evan Hazlett
a3eb0d077b Merge pull request #1040 from nathanleclaire/engine_options 
Implement configurable engine options
 2015-04-30 13:55:58 -04:00
Nathan LeClaire
2574c8ba5d Implement configurable engine options 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-04-29 17:58:14 -07:00
Aaron Welch
2a44f40f6c for ubuntu provision append hostname to 127.0.1.1 line in /etc/hosts 
Signed-off-by: Aaron Welch <welch@packet.net>
 2015-04-26 15:39:22 -04:00