Gotea/docker-machine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
2,597 Commits 1 Branch 72 Tags
63f8f1fb482bb4f99007b2763e3893fa4eababa5
Commit Graph

160 Commits

Author SHA1 Message Date
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
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
Jean-Laurent de Morlhon
48554182f1 Merge pull request #2427 from newpcraft/debugmsg_in_daemonresponding 
add debug message in dockerDaemonResponding function due to helping f…
 2015-11-30 09:56:29 +01:00
David Gageot
78b088d135 Add more logs to provisioner 
Signed-off-by: David Gageot <david@gageot.net>
 2015-11-27 09:36:58 +01:00
CHOE JUNGYEON
83f3c2f921 add debug message in dockerDaemonResponding function due to helping for troubleshooting of docker daemon state 2015-11-27 02:37:50 +09:00
Jean-Laurent de Morlhon
a55bba3ed2 Move tls-san flag to a local flag for create 
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
 2015-11-23 12:40:07 +01:00
Sam Alba
5b453e6305 Implemented '--tls-san' global arg for adding extra SANs (subject alt names) to server-side certificates 
Signed-off-by: Sam Alba <sam.alba@gmail.com>
 2015-11-23 12:17:29 +01:00
David Gageot
b9b7b6fe54 Merge pull request #2343 from nathanleclaire/systemd_remove_duplication 
Remove systemd-related driver duplication
 2015-11-19 10:10:54 +01:00
Nathan LeClaire
fc0981bd0f Remove systemd-related driver duplication 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-11-18 14:36:08 -08:00
David Gageot
b00e30c38f Revert "Remove systemd-related driver duplication" 
This reverts commit fda08f5e15.

Signed-off-by: David Gageot <david@gageot.net>
 2015-11-18 17:36:40 +01:00
David Gageot
88c48196ef Merge pull request #2326 from nathanleclaire/systemd_remove_duplication 
Remove systemd-related driver duplication
 2015-11-18 10:46:35 +01:00
David Gageot
a618a029cf Merge pull request #2327 from nathanleclaire/netstat_add_flga 
Add -n to get port number for netstat
 2015-11-18 09:27:10 +01:00
Nathan LeClaire
fda08f5e15 Remove systemd-related driver duplication 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-11-17 19:47:10 -08:00
Nathan LeClaire
1bdedc6ea2 Add -n to get port number for netstat 
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
 2015-11-17 18:24:44 -08:00
Nathan LeClaire
a0b75d1645 Merge pull request #2214 from nathanleclaire/delete_bridge 
Delete bridge after powering daemon down
 2015-11-17 16:56:35 -08:00