Commit Graph

253 Commits

Author SHA1 Message Date
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 92854bd31f Merge pull request #2523 from dgageot/2510-support-dns-names
FIX 2510 Support DNS names
2015-12-08 10:54:40 +01:00
David Gageot be1d75f1c5 Merge pull request #2522 from dgageot/simplify-ls-tests
Simplify ls command tests
2015-12-08 10:50:19 +01:00
David Gageot aca111a373 Merge pull request #2489 from jeanlaurent/logrus
Replace custom logging system by logrus
2015-12-08 10:27:38 +01:00
David Gageot c421bb456e Simplify ls command tests
Signed-off-by: David Gageot <david@gageot.net>
2015-12-08 10:18:42 +01:00
David Gageot eeb568fd27 FIX 2510 Support DNS names
Signed-off-by: David Gageot <david@gageot.net>
2015-12-08 10:11:33 +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
Jean-Laurent de Morlhon 4792177b11 Logrus Machine Logger
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 18:36:48 +01:00
Jean-Laurent de Morlhon 010a1c76e2 Use logrus
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 11:08:50 +01:00
Jean-Laurent de Morlhon 1079735af8 Remove withFields
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 10:34:43 +01:00
Jean-Laurent de Morlhon 2e79f67e93 Cleanup stdout/stderr log initialization
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 10:33:32 +01:00
Jean-Laurent de Morlhon 892e19c019 delete unused method
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 10:33:32 +01:00
Jean-Laurent de Morlhon 109bea4151 Extract interface and Remove log.print
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-07 10:33:32 +01:00
David Gageot 7f499308fc Merge pull request #2507 from dgageot/dead-code
Remove dead code
2015-12-07 09:51:07 +01:00
David Gageot 293055fcbc Remove dead code
Signed-off-by: David Gageot <david@gageot.net>
2015-12-07 09:15:12 +01:00
Kunal Kushwaha 66db37814d Bugfix#2504 Rename of temp file fails.
Tempfile was not closed, so rename opertion was failing.
Minor code refactor is done, to make function more readable.

Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-12-07 14:02:36 +09:00
Nathan LeClaire a277bc6c0a Merge pull request #2453 from dgageot/single-binary
Put all core drivers in docker-machine binary
2015-12-04 15:31:45 -08:00
David Gageot 3612c55677 Add version to machine ls
Signed-off-by: David Gageot <david@gageot.net>
2015-12-03 16:27:42 +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
David Gageot 92ce49b367 Put all core drivers in docker-machine binary
Signed-off-by: David Gageot <david@gageot.net>
2015-12-02 18:48:19 +01:00
Jean-Laurent de Morlhon f9f886f529 Display driver in error without crashing
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-02 18:27:21 +01:00
Anil Belur 1a3c3898c1 Fixes #1931
Now this change ensures `config.json` is first written into a temp-file and
rename into the original file, if no errors from the FS. If ENOSPC occurs on write,
when the machine is restarted, the previous `config.json` is still available on startup.

Extended `TestStoreSave()` to check for any residual config files in the
machine directory.

Signed-off-by: Anil Belur <askb23@gmail.com>
2015-12-02 21:42:01 +05:30
Jean-Laurent de Morlhon 225abe05fe Move heartbeat code after getversion
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-02 16:29:08 +01:00
Jean-Laurent de Morlhon 88f6fce204 Fix for #2474
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-12-02 16:29:08 +01:00
Nathan LeClaire f7ea3d9f19 Merge pull request #2434 from dgageot/check-after-create
Check machine after create
2015-11-30 16:24:43 -08:00
David Gageot 643b7349f7 Remove duplicated FakeApi
Signed-off-by: David Gageot <david@gageot.net>
2015-11-30 18:30:00 +01: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
Jean-Laurent de Morlhon aa36205174 Merge pull request #2432 from dgageot/provision-logs
Add more logs to provisioner
2015-11-27 09:50:42 +01:00
David Gageot 0c12b7dbc1 Check machine after create
Signed-off-by: David Gageot <david@gageot.net>
2015-11-27 09:43:34 +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
David Gageot 518e3b8bde Rename to rawDriver
Signed-off-by: David Gageot <david@gageot.net>
2015-11-26 14:08:09 +01:00
Nathan LeClaire 3a8061221c Remove RawDriver from persistence on disk
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-25 22:16:24 -08:00
Nathan LeClaire 08565fd198 Merge pull request #2396 from allingeek/master
Decoupled RPC Types from API
2015-11-25 22:03:29 -08:00
Nathan LeClaire 1acde29ebe Merge pull request #2413 from dgageot/simpler-code
Simpler code
2015-11-25 15:28:10 -08:00
Jeff Nickoloff c4a72491ec Decoupled RPC Types from API
Added compatibility for both 5.0 and 5.1 RPC plugins.
Addresses #2325

Signed-off-by: Jeff Nickoloff <jeff@allingeek.com>

	modified:   libmachine/drivers/plugin/register_driver.go
	modified:   libmachine/drivers/rpc/client_driver.go
2015-11-25 13:02:31 -08:00
Nathan LeClaire 3ddea9f53f Merge pull request #2409 from dgageot/more-commands-tests
Add more command tests
2015-11-25 10:25:09 -08:00
David Gageot 79efe19887 Simpler code
Signed-off-by: David Gageot <david@gageot.net>
2015-11-25 19:01:12 +01:00
Jean-Laurent de Morlhon 67b83f518f Fix #2410
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
Reviewed-by: David Gageot <david@gageot.net>
2015-11-25 18:27:35 +01:00
David Gageot 742cdb958b Add more command tests
Signed-off-by: David Gageot <david@gageot.net>
2015-11-25 14:23:29 +01:00
Nathan LeClaire 47da7f8314 Add interfaces for CLI unit testing and env test
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-24 18:09:27 -08:00
Nathan LeClaire 7b483fe0ee Revise CommandLine interface to contain libmachine client and store
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-24 09:59:58 -08:00
Nathan LeClaire 19ce7b79bd Revise CommandLine interface to contain libmachine client and store
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-23 19:29:20 -08: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