Jean-Laurent de Morlhon
fe37f1fb0d
Fix #2204 broken env unset
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net >
2015-11-12 17:32:27 +01:00
Olivier Gambier
89d9854943
Another pass at linting
...
Signed-off-by: Olivier Gambier <olivier@docker.com >
2015-11-10 16:58:14 +01:00
Nathan LeClaire
bc7da2b0fa
Merge pull request #2172 from dgageot/2154-query-virtualbox-serially
...
FIX #2154 query virtualbox serially
2015-11-09 12:00:03 -08:00
Olivier Gambier
93376828af
Merge pull request #2216 from nathanleclaire/plugin_stdout
...
Allow plugins to write to STDOUT
2015-11-07 14:00:12 -08:00
David Gageot
68092b3524
FIX #2154 query virtualbox serially
...
Signed-off-by: David Gageot <david@gageot.net >
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-07 16:14:25 +01:00
Nathan LeClaire
b92a6fd3ce
Allow plugins to write to STDOUT
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-06 18:21:38 -08:00
Nathan LeClaire
a31808d07e
Remove newline
...
Infof adds it automatically.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-06 18:18:06 -08:00
Nathan LeClaire
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
Kunal Kushwaha
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
Olivier Gambier
d2ada6488c
Lint
...
Signed-off-by: Olivier Gambier <olivier@docker.com >
2015-11-05 13:34:07 -08:00
David Gageot
11922080a1
FIX #2171 Fix faulty flag and add tests for SetConfigFromFlags
...
Signed-off-by: David Gageot <david@gageot.net >
2015-11-05 18:57:03 +01:00
David Gageot
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
Nathan LeClaire
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
Kunal Kushwaha
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
Nathan LeClaire
6be950f1c0
Merge pull request #2117 from dmp42/08-carry-on-2033
...
Carry on commits from #2033
2015-11-04 16:41:40 -08:00
Nathan LeClaire
828cb12e2c
Merge pull request #2177 from dmp42/13-lint-attempt-again
...
Lint, step 1
2015-11-04 15:29:52 -08:00
Nathan LeClaire
47aa16cff4
Merge pull request #2135 from janeczku/plugin-versioning
...
Fail gracefully when plugin binary implements outdated API
2015-11-04 14:40:54 -08:00
Olivier Gambier
19fc49b58a
Lint, step 1
...
The easy stuff
Signed-off-by: Olivier Gambier <olivier@docker.com >
2015-11-04 14:17:58 -08:00
Jan Broer
66ca5b07a2
Fail gracefully when plugin binary implements outdated API
...
Signed-off-by: Jan Broer <janeczku@yahoo.de >
2015-11-04 14:24:01 +01:00
Nathan LeClaire
9a4bc9a20d
Ensure that ls will still work when plugin cannot be found
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-03 11:35:30 -08:00
Nathan LeClaire
f5b6c87e7c
Remove automatic certificate regeneration
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-11-02 19:31:29 -08:00
Olivier Gambier
ae2d344c2b
Carry on commits from #2033
...
A couple of small cleanup and enhancements that were dropped after the revert.
Signed-off-by: Olivier Gambier <olivier@docker.com >
2015-10-30 16:33:26 -07:00
Nathan LeClaire
70e137991d
Fix DriverName missing in 0.3.1 => 0.5.0 migration
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
Signed-off-by: David Gageot <david@gageot.net >
2015-10-30 14:22:52 -07:00
Nathan LeClaire
3dd578318a
Stop heartbeat when there is an issue connecting to the server
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-10-26 12:55:48 -07:00
David Gageot
57dc1156de
Revert "Remove duplication over GetIP"
...
This reverts commit 99aacc7b79 .
Signed-off-by: David Gageot <david@gageot.net >
2015-10-26 18:47:03 +01:00
David Gageot
a7559fd3a8
Revert "Generic and Base slight cleanups"
...
This reverts commit 19625def22 .
Signed-off-by: David Gageot <david@gageot.net >
2015-10-26 18:46:54 +01:00
Nathan LeClaire
8b9291de64
Merge pull request #2033 from dmp42/03-cleanup
...
Code cleanup
2015-10-23 11:27:44 -07:00
Olivier Gambier
4bd43d604f
Merge pull request #2053 from nathanleclaire/rpc_heartbeat
...
Add heartbeat / automatic server cleanup code
2015-10-23 10:40:45 -07:00
Olivier Gambier
19625def22
Generic and Base slight cleanups
...
- tests for GetIP
- extract default values into consts (user & port)
- better error handling (cert permissions change)
- unexport Driver for generic (linting)
- ordering of methods and variables for better readability
Signed-off-by: Olivier Gambier <olivier@docker.com >
2015-10-23 10:38:57 -07:00
Olivier Gambier
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
Dave Goehrig
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
Nathan LeClaire
76c7accda0
Add heartbeat / automatic server cleanup code
...
This replaces the previous method of attempting to clean up servers when
an unexpected exit occurs in the client (e.g. SIGINT or panic) by a
heartbeat protocol. If the server does not hear from the connecting
client within a certain interval of time (500ms in this commit), it will
de-activate itself. This prevents dangling Docker Machine server
processes from accumulating.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-10-22 19:44:35 -07:00
Nathan LeClaire
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
Nathan LeClaire
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
Olivier Gambier
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
Olivier Gambier
1bfb34afd3
Merge pull request #2057 from dgageot/remove-dead-code
...
Remove dead code
2015-10-22 09:38:22 -07:00
Fabian Ruff
335811df0c
support upgrading b2d from custom urls
...
.
Signed-off-by: Fabian Ruff <fabian@progra.de >
2015-10-22 16:12:21 +02:00
Fabian Ruff
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
David Gageot
e2b6a832ac
Add more debug during certificates validation
...
Signed-off-by: David Gageot <david@gageot.net >
2015-10-22 11:11:31 +02:00
David Gageot
035c0de9e5
Remove dead code
...
Signed-off-by: David Gageot <david@gageot.net >
2015-10-22 11:02:54 +02:00
Xiaohui Liu
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
Matt Bogosian
f80dc360c7
Inspired by #1880 (and docker/compose#890 et al.). Make sure ca.pem subject is different from cert.pem subject to work-around OpenSSL bug.
...
Signed-off-by: Matt Bogosian <mtb19@columbia.edu >
2015-10-21 17:53:15 -07:00
Nathan LeClaire
4157dff31c
Increase SSH timeout back to five minutes
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-10-21 15:27:20 -07:00
Olivier Gambier
99aacc7b79
Remove duplication over GetIP
...
+ ip address proper validation
Signed-off-by: Olivier Gambier <olivier@docker.com >
2015-10-21 13:48:13 -07:00
Olivier Gambier
c2589c8099
Trivial cleanup / ordering / inline doc
...
Signed-off-by: Olivier Gambier <olivier@docker.com >
2015-10-21 13:48:13 -07:00
Olivier Gambier
bf3cd8b8f4
Remove useless duplication on PreCreateCheck
...
Signed-off-by: Olivier Gambier <olivier@docker.com >
2015-10-21 13:48:13 -07:00
Flavio Castelli
987718f24d
Add SUSE Enterprise Linux and openSUSE provision
...
Add support for SUSE Enterprise Linux and openSUSE.
Code revised to build against current master.
Signed-off-by: Flavio Castelli <fcastelli@suse.com >
2015-10-21 09:18:56 +02:00
Olivier Gambier
2b56c016b5
Revert "Add SUSE Enterprise Linux and openSUSE provision"
2015-10-20 19:35:09 -07:00
Olivier Gambier
2c6a671015
Merge pull request #1436 from flavio/add_openSUSE_and_SUSE_provision
...
Add SUSE Enterprise Linux and openSUSE provision
2015-10-20 19:32:30 -07:00
Dave Henderson
1b5bbaa494
Adding provisioner for Arch Linux
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com >
2015-10-20 16:07:04 -04:00