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
946712b1f7
Fix vet issues
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-24 13:30:50 +01:00
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
f4bfba96f1
Fix for coreos provisionning with google driver
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-24 10:11:34 +01:00
75849b81d4
add swarm config to coreos
...
Signed-off-by: Dustin Blackman <dev@dustinblackman.com>
2015-12-23 11:48:18 -05:00
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
280f9c6cc6
FIX #2540 provisioners honor engine-install-url
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-21 15:07:43 +01:00
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
f09bbb8f7f
Increase the provisioning timeout
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-14 14:15:51 +01:00
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
58b4cce392
Remove dead code and other cosmetic changes
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-10 14:20:46 +01:00
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
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
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
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
60dba4d2d5
added advertise flag to swarm manager
...
Signed-off-by: Lance Andersen <techlance@gmail.com>
2015-12-07 12:37:26 -07:00
293055fcbc
Remove dead code
...
Signed-off-by: David Gageot <david@gageot.net>
2015-12-07 09:15:12 +01:00
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
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
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
78b088d135
Add more logs to provisioner
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-27 09:36:58 +01:00
83f3c2f921
add debug message in dockerDaemonResponding function due to helping for troubleshooting of docker daemon state
2015-11-27 02:37:50 +09:00
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
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
b9b7b6fe54
Merge pull request #2343 from nathanleclaire/systemd_remove_duplication
...
Remove systemd-related driver duplication
2015-11-19 10:10:54 +01:00
fc0981bd0f
Remove systemd-related driver duplication
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-18 14:36:08 -08:00
b00e30c38f
Revert "Remove systemd-related driver duplication"
...
This reverts commit fda08f5e15
2015-11-18 17:36:40 +01:00
88c48196ef
Merge pull request #2326 from nathanleclaire/systemd_remove_duplication
...
Remove systemd-related driver duplication
2015-11-18 10:46:35 +01:00
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
fda08f5e15
Remove systemd-related driver duplication
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-17 19:47:10 -08:00
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
a0b75d1645
Merge pull request #2214 from nathanleclaire/delete_bridge
...
Delete bridge after powering daemon down
2015-11-17 16:56:35 -08:00
4457dce51d
Introduce support for ubuntu 15.04 and higher
...
Starting with version 15.04, ubuntu is based on systemd. The existing
ubuntu provider did not support systemd.
This commit introduce a new provider dedicated to systemd based
versions.
The previous provider is renamed to ubuntu_upstart.
Provider detection uses the /etc/os=release VERSION_ID.
Version ID is converted to a float value and then used to choose between
providers.
Unit tests are validating the provisioner compatibility.
Fixes #1891
Signed-off-by: Thomas Recloux <thomas.recloux@gmail.com>
2015-11-17 11:21:41 +01:00
b0f687b1b8
Merge pull request #2168 from dgageot/2167-b2d-upgrade
...
FIX #2167 b2d download timeout during upgrade
2015-11-06 18:16:52 -08:00
a020c3eac7
Delete bridge after powering daemon down
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-06 17:49:33 -08:00
055de5f276
BugFix: IP in template need as per Struct
...
Lint changes in SwarmCommandOptions chnaged `Ip` to `IP`.
It required change in template code also.
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-11-06 15:47:15 +09:00
d2ada6488c
Lint
...
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-05 13:34:07 -08:00
1f0de8f84e
FIX #2167 b2d download timeout during upgrade
...
+ Download boot2docker before we stop the machine.
+ Use default(longer) timeout
+ Show b2d download progress
+ Fix typo
+ Add log before stop
Signed-off-by: David Gageot <david@gageot.net>
2015-11-05 09:39:33 +01:00
ede8f2a32f
Merge pull request #2166 from kunalkushwaha/swarm-proxy
...
Environment variables passed to provision machine, will be passed to …
2015-11-04 18:50:41 -08:00
8d2ae162b7
Environment variables passed to provision machine, will be passed to containers for swarm also.
...
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-11-05 11:27:58 +09:00
19fc49b58a
Lint, step 1
...
The easy stuff
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-04 14:17:58 -08:00
4e7f8ed7a6
Merge pull request #1856 from databus23/b2d_gh_enterprise_urls
...
support github enterprise urls for b2d downloads
2015-10-23 10:37:46 -07:00
1df80ba111
Adding localhost to the list of alt_names
...
When attempting to connect to the docker api from the machine itself,
the TLS verification of the certificate checked against the public
IP address of the primary interface. This is undesirable on hosts
which have NAT rules that block access to that address by default.
Adding "localhost" to the list of alt_names allows the cert to be
verified and connections to localhost (either 127.0.0.1 or [::1]) to
the port to pass verification. Otherwise one would need to disable
verification just to connect to the local docker instance.
Signed-off-by: David Gageot <david@gageot.net>
2015-10-23 09:57:55 +02:00
e80e448cd5
Merge pull request #2035 from flavio/add_openSUSE_and_SUSE_provision
...
Add SUSE Enterprise Linux and openSUSE provision
2015-10-22 14:54:58 -07:00
f6bbbdce7f
Merge pull request #2056 from xiaohui/force-tty-allocation
...
force tty allocation for ssh with multiple '-tt'.
2015-10-22 11:29:31 -07:00
c60b2cb2f9
Merge pull request #1910 from posita/posita/1880-ssl-cert-snafu
...
READY FOR REVIEW - Work-around erroneous SSL: CERTIFICATE_VERIFY_FAILED error with some buggy versions of OpenSSL
2015-10-22 09:57:56 -07:00
335811df0c
support upgrading b2d from custom urls
...
.
Signed-off-by: Fabian Ruff <fabian@progra.de>
2015-10-22 16:12:21 +02:00
5021ffd2e7
support github enterprise urls for b2d downloads
...
This commit allows downloading boot2docker releases not only from the official releases url (https://api.github.com/repos/boot2docker/boot2docker/releases ) but from arbitrary github repositories that publish releases with a boot2docker.iso artifact. It also supports downloading from github enterprise.
Signed-off-by: Fabian Ruff <fabian@progra.de>
2015-10-22 16:12:21 +02:00
e2b6a832ac
Add more debug during certificates validation
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-22 11:11:31 +02:00
27cdffe042
force tty allocation for ssh with multiple '-tt'.
...
fix #2037 :
when provision on CentOS 7.0, it needs to force tty allocation with multiple '-t' option.
Otherwise, the ssh command will failed with "sudo: sorry, you must have a tty to run sudo"
in SetHostname.
Signed-off-by: Xiaohui Liu <xiaohui.liu@ucloud.cn>
2015-10-22 16:26:22 +08:00
David Gageot