David Gageot
8345672b18
FIX #3040 Slow test
...
Signed-off-by: David Gageot <david@gageot.net>
2016-02-11 13:31:36 -08:00
David Gageot
15b5a1d10d
Merge pull request #2838 from mssola/export-session
...
libmachine/ssh: export the NativeClient.Session function
2016-02-09 17:36:25 -08:00
Pierre DAL-PRA
7dcd2c7b25
Warn that Boot2Docker ISO won't be auto upgraded if its URL is explicitly set
...
Signed-off-by: Pierre DAL-PRA <dalpra.pierre@gmail.com>
2016-02-09 00:50:23 +01:00
Nathan LeClaire
5ced31397e
Wait for SSH before daemon detection
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-02-04 13:29:46 -08:00
Nathan LeClaire
265dd37594
Add correct Swarm port bindings
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-28 15:51:41 -08:00
David Gageot
b6be1b79bc
Merge pull request #2954 from jeanlaurent/engine-url
...
Fix #2029 - local drivers dont run with engine-install-url
2016-01-28 18:26:01 +01:00
Jean-Laurent de Morlhon
8eb22b411b
Fix #2029 - local drivers dont run with engine-install-url
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-01-28 18:05:58 +01:00
David Gageot
794cf4cf4d
Make go vet ./... happy
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-28 11:15:12 +01:00
Miquel Sabaté Solà
0a2b5ab4d3
libmachine/ssh: added the Start and Wait functions to the Client interface
...
The Start function starts an SSH session and executes the given command. The
returned parameters are readers for the stdout and stderr. This way, developers
can further manipulate the output of the remote command. The Wait function is
command to that of the exec.Cmd type.
The readers returned by the Start function are io.ReadCloser instead of
io.Reader, as one might think. This is done this way to simplify the API so
the ExternalClient doesn't have to provide extra functions to close the
io.ReadCloser's as returned by the cmd.StdoutPipe and cmd.StderrPipe functions.
Finally, I've also changed the receivers of the functions related to the Native
and the External clients. This is done this way because we need to save the
open session or the command from each client in order to implement the Wait
function. Note that the Wait function is needed in order to properly close the
session that is hidden underneath the Native client.
Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>
2016-01-27 09:52:29 +01:00
David Gageot
1bc6cdd357
FIX #2941 Wait for Docker after a restart
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-27 09:35:47 +01:00
David Gageot
62db9eb370
Merge pull request #2936 from nathanleclaire/poll_daemon_start
...
Wait for Docker daemon on host start
2016-01-27 09:27:34 +01:00
Nathan LeClaire
3757dc5313
Add code to wait for Docker daemon on start
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-26 18:42:10 -08:00
David Gageot
b4209ee84b
Remove spurious log that adds no value and make ITs
...
sometimes fail because of an additional line.
Signed-off-by: David Gageot <david@gageot.net>
2016-01-26 17:07:13 +01:00
Patrik Erdes
92b9853478
Fix #2903 , revert #2833 since it makes it impossible to start up a Swarm master with the token discovery method
...
Signed-off-by: Patrik Erdes <patrik@erdes.se>
2016-01-22 14:51:59 +01:00
Stefan Scherer
3b4b168051
Check grand parent if not directly called from a windows shell
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
2016-01-20 01:16:00 +01:00
Nathan LeClaire
ac0adbe7f8
Update CoreOS provisioner to use 'docker daemon'
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-18 14:28:42 -08:00
David Gageot
b5e6e20a8f
Disable bugsnag report for upgrades for now
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-18 11:56:20 +01:00
David Gageot
d518e171b9
Fix bugsnag reports for create
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-18 11:42:21 +01:00
David Gageot
19ec3e6d50
Fix the build
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-18 11:06:03 +01:00
David Gageot
501b8666ce
Merge pull request #2121 from nathanleclaire/provision_cmd
...
Add docker-machine provision command
2016-01-18 08:53:15 +01:00
Jean-Laurent de Morlhon
947adf539c
Merge pull request #2850 from zchee/fix-provision-redhat
...
Fix docker daemon flag on redhat
2016-01-16 08:38:02 +01:00
Koichi Shiraishi
21e4472920
Fix docker daemon flag on redhat
...
- Same as https://github.com/docker/machine/pull/2844
Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
2016-01-16 12:54:06 +09:00
Nathan LeClaire
0bbf6f126d
Merge pull request #2789 from robvanmieghem/master
...
FIX #2411 On a btrfs system, don't default to aufs
2016-01-15 13:20:26 -08:00
Rob Van Mieghem
84ff3e3549
Improve provisiontest.FakeSSHCommander
...
Signed-off-by: Rob Van Mieghem <rob@vanmieghemcloud.com>
2016-01-15 21:13:29 +01:00
Jean-Laurent de Morlhon
8094d6ce52
Merge pull request #2844 from zchee/fix-provision-systemd
...
Fix docker daemon flag on systemd
2016-01-15 11:10:27 +01:00
David Gageot
ee5d3b3174
Merge pull request #2493 from nathanleclaire/ssh_help_additional_tests
...
Additional SSH tests
2016-01-15 08:44:59 +01:00
Koichi Shiraishi
28b2fe9ce0
Fix docker daemon flag on systemd
...
Signed-off-by: Koichi Shiraishi <zchee.io@gmail.com>
2016-01-15 13:05:56 +09:00
Nathan LeClaire
aa54a5f272
Add additional tests for SSH
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-14 17:27:41 -08:00
Nathan LeClaire
7246b2c965
Merge pull request #2833 from kunalkushwaha/multi-master
...
Configures swarm-master with failover support
2016-01-14 17:11:40 -08:00
Kunal Kushwaha
30a2e8e068
Configures swarm-master with failover support
...
If more then one master is created with same discovery backend,
Rest of master will be configured as replica of primary master
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2016-01-14 09:46:15 +09:00
Rob Van Mieghem
3e758c6d86
FIX #2411 Do not default to aufs on a btrfs filesystem
...
Signed-off-by: Rob Van Mieghem <rob@vanmieghemcloud.com>
2016-01-13 16:53:22 +01:00
David Gageot
830d17c377
Merge pull request #2823 from nathanleclaire/panic_recovr
...
Add panic recovery to Create method for drivers
2016-01-13 09:11:11 +01:00
Nathan LeClaire
d80ea22623
Add panic recovery to Create method for drivers
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-12 19:25:18 -08:00
Nathan LeClaire
01c7556e3a
Add docker-machine provision command
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2016-01-12 11:52:36 -08:00
Jean-Laurent de Morlhon
45a8f5e7a6
Returns exit code 3 on pre-create check
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-01-12 11:04:39 +01:00
David Gageot
f5ba0f7420
Wait for error logs
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-11 08:57:27 +01:00
Jean-Laurent de Morlhon
f10584ec85
Remove remaining log.Fatal
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2016-01-07 12:32:55 +01:00
David Gageot
f96595d7d0
Fix Bugnag Report not being sent
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-07 12:09:00 +01:00
Nathan LeClaire
276e7e48b6
Merge pull request #2769 from dustinblackman/fix/swarm-manage-advertise
...
Set swarm manage to advertise on 3376
2016-01-06 14:27:21 -08:00
David Gageot
2aebbb8d88
Merge pull request #2708 from dgageot/external
...
Add CI tests for an external driver
2016-01-06 21:54:12 +01:00
Dustin Blackman
288fddb736
set swarm manage to advertise on 3376
...
Signed-off-by: Dustin Blackman <dev@dustinblackman.com>
2016-01-06 15:08:31 -05:00
David Gageot
e28f7d5aa9
FIX #2498 Introduce CI tests for external binary compatibility
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-06 17:09:03 +01:00
David Gageot
fc025e1984
FIX #2746 Improve shell detection in bugsnag reports
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-06 16:57:33 +01:00
Jean-Laurent de Morlhon
ad3e6b5bf0
Merge pull request #2759 from dgageot/better-windows-version-detection
...
Better windows version detection
2016-01-06 16:16:01 +01:00
David Gageot
f466aa9499
FIX #2745 better Windows version detection
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-06 12:36:23 +01:00
David Gageot
af09ebbe4e
This code is only useful to crash reports
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-06 12:36:22 +01:00
David Gageot
b0d265a68b
Remove Dead code
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-06 11:51:30 +01:00
David Gageot
f5293e10e2
Crash reporting shouldn't be static
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-05 18:16:11 +01:00
David Gageot
cd9301e252
Merge pull request #2730 from dgageot/close-api
...
Close api
2016-01-05 15:50:44 +01:00
David Gageot
b7fa3327cf
Merge pull request #2733 from dgageot/2688-run-docker-machine-from-path
...
Run docker-machine from the PATH for core drivers
2016-01-04 16:28:33 +01:00
David Gageot
e143c68cf9
Merge pull request #2732 from dgageot/better-logs
...
Improve Start/Stop/Kill/Restart lifecycle/logs
2016-01-04 16:24:55 +01:00
David Gageot
61fed5c11b
Merge pull request #2728 from dgageot/update-docker-client
...
FIX #2703 Update dockerclient dependency
2016-01-04 16:02:30 +01:00
David Gageot
85405468de
Fix the vbox sample code
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 14:59:25 +01:00
David Gageot
263f8c5cdd
Remove duplication
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 14:59:25 +01:00
David Gageot
00eee7db1d
Simplify Api
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 14:59:25 +01:00
David Gageot
67f8b19c9b
Don't use global variables. Make the Api closeable
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 14:59:15 +01:00
David Gageot
3990815e10
FIX #2688 - Run docker-machine from the PATH for core drivers
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 14:50:04 +01:00
David Gageot
d8fb917cd8
FIX #2703 Update dockerclient
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 11:33:33 +01:00
David Gageot
5cfdcfe7b6
Remove duplication on certificates code
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 10:40:21 +01:00
David Gageot
885c37e536
Use accessor
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 10:40:12 +01:00
David Gageot
9354fed274
Remove some duplication related to swarm
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 10:40:04 +01:00
David Gageot
6f53a0b9ed
Simpler code
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 10:39:38 +01:00
David Gageot
855de0741a
Logs for Kill
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 10:38:25 +01:00
David Gageot
e9aa75f021
Logs for Restart
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 10:38:25 +01:00
David Gageot
783d2b124e
Logs for Start
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 10:38:25 +01:00
David Gageot
bbe76b5a26
Logs for Stop
...
Signed-off-by: David Gageot <david@gageot.net>
2016-01-04 10:38:25 +01:00
Jacob Blain Christen
94329a6e06
fix swarm provision issue #2715 : invalid restart policy
...
Signed-off-by: Jacob Blain Christen <dweomer5@gmail.com>
2015-12-30 19:27:59 -07:00
Nathan LeClaire
1b76a4467c
Merge pull request #2711 from dgageot/ssh-batch-mode
...
We must never ask for a password interactively
2015-12-29 11:21:42 -08:00
David Gageot
8524a4e7d9
We must never ask for a password interactively
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-29 19:19:55 +01:00
Akihiro Suda
51a30db7a2
Print a warning for Boot2Docker v1.9.1, which is known to have an issue with AUFS ( docker/docker#18180 )
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
2015-12-29 11:50:26 +00:00
David Gageot
c180a7962b
Fix race condition. cmdWait will do the closing
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 13:26:47 +01:00
David Gageot
b185bb3dbd
Keep on heartbeating after failure
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 11:49:38 +01:00
David Gageot
501c4f3460
Read only if there is something to read
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 11:49:38 +01:00
Nathan LeClaire
232c0ea37e
Fix truncated plugin binary logs
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-12-28 11:49:38 +01:00
David Gageot
34f6e20165
Print an error when a driver cannot be closed
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 11:49:38 +01:00
David Gageot
0cd8312e72
Remove dead code
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 11:37:32 +01:00
David Gageot
f56dab0676
Make test 10s faster
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-28 11:37:32 +01:00
stelcheck
26c68b5c88
Disable ControlPath on SSH connections
...
Signed-off-by: Marc Trudel <mtrudel@wizcorp.jp>
Signed-off-by: David Gageot <david@gageot.net>
2015-12-24 14:32:31 +01:00
David Gageot
b935949c5e
Merge pull request #2680 from dgageot/better-swarm-error
...
Better error when swarm is not started
2015-12-24 14:25:03 +01:00
David Gageot
89d9e2fe90
Close drivers on exit
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-24 13:44:42 +01:00
David Gageot
946712b1f7
Fix vet issues
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-24 13:30:50 +01:00
David Gageot
6462e7ecfa
FIX #2677 better error message if swarm is down
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-24 13:28:56 +01:00
David Gageot
12bf80fb12
Merge pull request #2679 from dgageot/fix-coreos-google
...
Fix for coreos provisionning with google driver
2015-12-24 11:11:35 +01:00
David Gageot
cef64513cb
Simplify code
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-24 11:09:40 +01:00
David Gageot
efbec45e2d
Merge pull request #2674 from dustinblackman/coreos/swarm
...
Add swarm configuration to CoreOS provisioner
2015-12-24 10:30:21 +01:00
David Gageot
f4bfba96f1
Fix for coreos provisionning with google driver
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-24 10:11:34 +01:00
David Gageot
fd44d1b1e4
Merge pull request #2658 from dgageot/improve-hyper-v
...
Improve hyper-v driver
2015-12-24 09:57:53 +01:00
Dustin Blackman
75849b81d4
add swarm config to coreos
...
Signed-off-by: Dustin Blackman <dev@dustinblackman.com>
2015-12-23 11:48:18 -05:00
David Gageot
8b31854a80
Extract the code to create a b2d disk image
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-23 16:36:40 +01:00
David Gageot
670c4808ed
FIX #2663 reduce calls to the driver in ls
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-23 13:58:06 +01:00
Jean-Laurent de Morlhon
9f6764ccd3
Merge pull request #2666 from cvstebut/master
...
close handle on destination after copying boot2docker.iso into vm folder
2015-12-23 09:34:41 +01:00
Christian von Stebut
1cd6a37343
close handle on destination after copying boot2docker.iso into vm folder - will otherwise keep hyper-v from starting vm
...
Signed-off-by: Christian von Stebut <christian@von.stebut.org>
2015-12-23 01:34:56 +01:00
Neil Wilson
c045ceec1e
Change host restart to use the driver implementation
...
Fixes #2140
Signed-off-by: Neil Wilson <neil@aldur.co.uk>
2015-12-22 10:31:34 +01:00
Jean-Laurent de Morlhon
5ee9dfdc94
Merge pull request #2649 from dgageot/2540-honor-engine-install-url
...
FIX #2540 provisioners honor engine-install-url
2015-12-22 09:53:40 +01:00
Jean-Laurent de Morlhon
6e8aaa0d56
Merge pull request #2645 from dgageot/2370-add-feedback
...
FIX #2370 add feedback to the user
2015-12-21 17:08:07 +01:00
Jean-Laurent de Morlhon
cd6690ccd5
Merge pull request #2647 from dgageot/windows-version
...
Try multiple commands to find windows version
2015-12-21 17:06:00 +01:00
David Gageot
7b638738cc
Try multiple commands to find windows version
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-21 16:19:01 +01:00
David Gageot
6f8a6dd272
FIX #2641 Digital Ocean Custom SSH port
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-21 16:16:33 +01:00
David Gageot
280f9c6cc6
FIX #2540 provisioners honor engine-install-url
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-21 15:07:43 +01:00
David Gageot
34b6468c2c
FIX #2370 add feedback to the user
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-21 12:04:01 +01:00