Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,764 Commits 1 Branch 72 Tags
5d92f351de71ff4d842fd39b42e8fda738458965
Commit Graph

173 Commits

Author SHA1 Message Date
Tiago Pires
a6f19ef936 FIX #3141 Refactor netstat command and tests 
Updated `netstat` command to minimize its output with `-t` and `-l`
flags.
Refactored regex on `libmachine/provision/utils.go`:`checkDaemonUp` to
avoid `matchNetstatOut` returning `true` when remote machine has a
similar port to dockerPort listening (e.g. dockerPort := 2376 and
remote machine has port 23760 listening).
Refactored `utils_test.go` with more accurate `netstat` output.

Signed-off-by: Tiago Pires <tandrepires@gmail.com>
 2016-03-28 23:29:26 +01:00
bingshen.wbs
9914e4027e add systemd requirement 
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
 2016-03-15 16:19:54 +08:00
Nathan LeClaire
6d41f4ae46 Merge pull request #3172 from xinxian0458/issue-3145 
fixed issue-3145, enable engine-install-url in CentOS.
 2016-03-14 15:25:12 -07:00
Jie Zhang
93fe1d199f fixed issue-3145, enable engine-install-url in CentOS. 
Signed-off-by: Jie Zhang <zhangjie0220@gmail.com>
 2016-03-14 14:24:44 +08:00
Tiago Pires
63ea976b1d FIX #1858 Add engine port 
Added flag `--generic-engine-port` to `generic` drive in order to specify other port than `2376` on
Docker engine.
Updated `generic` driver documentation.

Signed-off-by: Tiago Pires <tandrepires@gmail.com>
 2016-03-11 13:13:30 +00:00
Jason Roehm
5df137e562 fix: --engine-env was not effective when provisioning on CoreOS 
Signed-off-by: Jason Roehm <jroehm@gmail.com>
 2016-03-01 14:04:31 -05:00
Jean-Charles Sisk
b1999a7820 fix apt-get error on conf file conflict 
Signed-off-by: Jean-Charles Sisk <jasisk@gmail.com>
 2016-02-23 21:30:04 -05:00
Jean-Laurent de Morlhon
1eaf5a464f Merge pull request #3020 from mssola/swarm-experimental 
Added a flag to enable experimental Swarm features
 2016-02-13 14:10:44 -08:00
Miquel Sabaté Solà
7e201c4005 Added a flag to enable experimental Swarm features 
The `create` command now has the `--swarm-experimental` boolean flag, that
tells the Swarm provisioner to enable experimental features in Swarm.

Fixes #2861

Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>
 2016-02-13 12:21:20 +01:00
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
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
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
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
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
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
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
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
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
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
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
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
d8fb917cd8 FIX #2703 Update dockerclient 
Signed-off-by: David Gageot <david@gageot.net>
 2016-01-04 11:33:33 +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
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
946712b1f7 Fix vet issues 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-24 13:30:50 +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
f4bfba96f1 Fix for coreos provisionning with google driver 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-24 10:11:34 +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
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
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
0a74068b11 Merge pull request #2298 from skatsuta/create-update-iso 
Upgrade the boot2docker.iso cache if possible when creating a VirtualBox machine
 2015-12-18 08:39:22 +01:00
David Gageot
f09bbb8f7f Increase the provisioning timeout 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-14 14:15:51 +01:00
Soshi Katsuta
bbe7a00db5 libmachine/mcnutils: check the version of cached iso and download the latest one when it is out-of-date 
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com>
 2015-12-11 22:04:31 +09:00
David Gageot
58b4cce392 Remove dead code and other cosmetic changes 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-10 14:20:46 +01:00
Kunal Kushwaha
f3689349a4 Host provisioing using Docker API 
Replaces the code of provisioing with Go Templates with DockerAPI

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
 2015-12-09 13:05:43 +09:00
David Gageot
53a7528e4d Merge pull request #2515 from drankinn/2342_replication_advertise 
Fixes issue #2342 - Issue provisioning swarm master with --replication through Docker Machine
 2015-12-08 10:55:47 +01:00
David Gageot
8f6b8da399 Merge pull request #2483 from dongmx/master 
Swarm container net should be host. If use bridge, sometime containers…
 2015-12-08 09:03:35 +01:00
David Gageot
6583e64e48 Merge pull request #2486 from dongmx/issue2485 
issue #2485, In generic driver If a permanent IP address and hostname has alread in /etc/hosts
 2015-12-08 09:01:35 +01:00
Lance Andersen
60dba4d2d5 added advertise flag to swarm manager 
Signed-off-by: Lance Andersen <techlance@gmail.com>
 2015-12-07 12:37:26 -07:00
David Gageot
293055fcbc Remove dead code 
Signed-off-by: David Gageot <david@gageot.net>
 2015-12-07 09:15:12 +01:00
dongmx
ce524e1740 Swarm container net should be host. If use bridge, sometime container ip addresses conflict. 
Signed-off-by: dongmx <dongmx@xueqiu.com>
 2015-12-03 19:11:34 +08:00
dongmx
e799388e85 issue #2485, If a permanent IP address and hostname has alread in /etc/hosts 
Signed-off-by: dongmx <dongmx@xueqiu.com>
 2015-12-03 18:59:40 +08:00