c99bb22eeb
Merge pull request #2028 from dmp42/02-build-fixes
...
Minor cleanup and fix #2022
2015-10-23 18:50:04 +02:00
8cfc28e37a
Merge pull request #2065 from dgageot/adding-localhost-to-alt_names
...
Adding localhost to the list of alt_names
2015-10-23 09:07:54 -07:00
768a044dad
Merge pull request #2067 from brutasse/patch-1
...
Typo in EXOSCALE_IMAGE
2015-10-23 16:45:08 +02:00
658a6bc1b3
Typo in EXOSCALE_IMAGE
...
Signed-off-by: Bruno Renié <brutasse@gmail.com>
2015-10-23 14:47:30 +02: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
0ac5c901d2
Merge pull request #2054 from SvenDowideit/fix-errant-links
...
Fix some links found with linkchecker
2015-10-22 16:16:47 -07:00
834c687226
Fix some links found with linkchecker
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-23 09:07:02 +10:00
9911019102
Merge pull request #1993 from leedm777/completion
...
Adding bash completion and helper scripts
2015-10-22 15:06:27 -07: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
7180ddca87
Adding bash completion and helper scripts
...
This patch adds some bash helper scripts.
* docker-machine.bash - command completion for docker-machine
* docker-machine-prompt.bash - function for putting the active machine
name in PS1
* docker-machine-wrapper.bash - function wrapper adding an `use`
command that runs `eval $(docker-machine env whatever)` in the
current shell.
Signed-off-by: David M. Lee <dlee@respoke.io>
2015-10-22 15:34:42 -05:00
07bcb9a7aa
Merge pull request #2058 from dgageot/improve-cmd-exe-support
...
improve cmd shell support
2015-10-22 11:59:55 -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
11fd9648ac
Merge pull request #1639 from feelobot/validate-ec2-vpc-id-matches-subnet-id
...
Use SDK to Validate VpcID with SubnetId
2015-10-22 09:52:18 -07:00
1bfb34afd3
Merge pull request #2057 from dgageot/remove-dead-code
...
Remove dead code
2015-10-22 09:38:22 -07:00
1a6a9de6c7
Merge pull request #2006 from dgageot/1954-certificate-always-regenerated
...
Investigate 1954 certificate always regenerated
2015-10-22 09:36:11 -07:00
1d3268d128
improve cmd shell support
...
Signed-off-by: Stefan Scherer <scherer_stefan@icloud.com>
Signed-off-by: David Gageot <david@gageot.net>
2015-10-22 12:15:33 +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
035c0de9e5
Remove dead code
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-22 11:02:54 +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
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
a1e610bdd3
Merge pull request #2049 from nathanleclaire/0.5.0-rc3
...
Bump version to rc3
2015-10-21 16:48:34 -07:00
cb473ad0a7
Merge pull request #2027 from dgageot/2019-fix-env-hints
...
FIX #2019 invalid env hints
2015-10-21 16:44:33 -07:00
8d78aed26c
Bump version to rc3
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-21 16:36:27 -07:00
19cb0d9b07
Merge pull request #2048 from nathanleclaire/increase_ssh_timeout
...
Increase SSH timeout back to five minutes
2015-10-21 16:33:58 -07:00
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
de5d052985
Merge pull request #2044 from nathanleclaire/minor_docs_fix
...
Fix ordered list numbering
2015-10-21 13:18:57 -07:00
70dfc1e4db
Fix ordered list numbering
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-21 12:51:28 -07:00
20fa654a6b
Merge pull request #2042 from moxiegirl/carry-1352
...
AWS driver updates and to carry user's pr
2015-10-21 12:50:10 -07:00
a21e8f1892
Merge pull request #2043 from dgageot/report-virtual-box-errors
...
Report VirtualBox errors
2015-10-21 12:19:54 -07:00
6bbec2df68
Report VirtualBox errors
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-21 21:03:51 +02:00
97fcc446d7
Merge pull request #2038 from dgageot/brownoxford-validate-cidr
...
Additional validation on virtualbox-hostonly-cidr
2015-10-21 11:54:48 -07:00
0cf8b761d7
Carrys and closes #1352
...
Pull the chmod line per reviewers
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-21 11:50:14 -07:00
6a7c8c2a25
Additional validation on virtualbox-hostonly-cidr
...
Check that the CIDR provided for a virtualbox host only CIDR is specified as a host IP and netmask, e.g., 192.168.100.1/24, and not a network IP and netmask, e.g., 192.168.100.0/24. This will help prevent confusion like #1383
Signed-off-by: Chris Abernethy <cabernet@chrisabernethy.com>
Signed-off-by: David Gageot <david@gageot.net>
2015-10-21 20:46:13 +02:00
56acdcf5ae
Merge pull request #2031 from hairyhenderson/check-vtx-darwin-1983
...
Adding support for darwin to IsVTXDisabled
2015-10-21 11:26:28 -07:00
62a28e1217
Merge pull request #2036 from dgageot/2020-better-message-when-vboxmanage-not-found
...
FIX #2020 Better error when vboxmanage is missing
2015-10-21 09:27:09 -07:00
38b7fe5013
FIX #2020 Better error when vboxmanage is missing
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-21 09:35:33 +02:00
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
c442690618
Merge pull request #2034 from docker/revert-1436-add_openSUSE_and_SUSE_provision
...
Revert "Add SUSE Enterprise Linux and openSUSE provision"
2015-10-20 19:35:41 -07:00
2b56c016b5
Revert "Add SUSE Enterprise Linux and openSUSE provision"
2015-10-20 19:35:09 -07:00
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
e4f0e66cb7
Merge pull request #1449 from hairyhenderson/arch-provisioner-1293
...
Adding provisioner for Arch Linux
2015-10-20 19:29:02 -07:00
d36fa5f9ff
Minor cleanup and fix #2022
...
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-10-20 19:23:36 -07:00
e2856e36f4
Adding support for darwin to IsVTXDisabled
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-10-20 21:20:40 -04:00
1b5bbaa494
Adding provisioner for Arch Linux
...
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-10-20 16:07:04 -04:00
6b7628a175
Use SDK to Validate VpcID with SubnetId
...
Signed-off-by: feelobot <felix.a.rod@gmail.com>
2015-10-20 12:37:33 -07:00
4c5615c5e4
Merge pull request #1976 from dgageot/add-tests-virtualbox-driver
...
Add tests to virtualbox driver
2015-10-20 10:28:53 -07:00
417cd8a9d3
Merge pull request #2021 from dgageot/1974-fix-makefile
...
FIX #1974 in-container make test fails
2015-10-20 10:27:44 -07:00
94361315a8
Add tests to virtualbox driver
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-20 19:08:18 +02:00
72fbf70899
Merge pull request #1990 from dgageot/1983-check-vtx-amdv
...
Host needs VT-x/AMD-v enabled for docker-machine to work on virtualbox
2015-10-20 10:01:22 -07:00
David Gageot
Olivier Gambier
Bruno Renié
Dave Goehrig
Nathan LeClaire
Sven Dowideit
David M. Lee
Stefan Scherer
Xiaohui Liu
Matt Bogosian
Nathan LeClaire
Mary Anthony
Chris Abernethy
Flavio Castelli
Olivier Gambier
Dave Henderson
feelobot