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
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
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
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
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
e959f7f1df
Merge pull request #2026 from dgageot/fix-integration-tests
...
Fix Typos in integration tests
2015-10-20 09:47:23 -07:00
bd532747f1
FIX #2019 invalid env hints
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-20 17:58:35 +02:00
3ab5520ea3
Fix Typos in integration tests
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-20 17:56:27 +02:00
9c8b4e0da3
FIX #1974 in-container make test fails
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-20 14:56:07 +02:00
4a33fabe8b
Check that VT-X/AMD-v is enabled
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-20 09:56:43 +02:00
6cac8cc95f
Merge pull request #2015 from nathanleclaire/bump_0.5.0_rc2
...
Bump version to 0.5.0-rc2
2015-10-19 17:51:24 -07:00
f8491c8140
Bump version to 0.5.0-rc2
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-19 17:44:31 -07:00
950aa5cad2
Merge pull request #2014 from nathanleclaire/print_app_err_msg
...
Spit out at least some message when flag parsing etc. fails
2015-10-19 17:43:36 -07:00
56f457c2ef
Merge pull request #2013 from nathanleclaire/no_stdout_env_config
...
Ensure log writes only to os.Stderr for env and config command
2015-10-19 17:43:23 -07:00
5bba2b3a64
Merge pull request #2012 from nathanleclaire/forward_compat_configs
...
Add some small support for forward compatible configuration mistakes
2015-10-19 17:43:03 -07:00
c93b79abef
Spit out at least some message when flag parsing etc. fails
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-19 17:30:59 -07:00
17f0a32b79
Ensure log writes only to os.Stderr for env and config command
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-19 17:30:18 -07:00
7400a77b32
Add some small support for forward compatible configuration mistakes
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-19 17:29:17 -07:00
95f626ce21
Merge pull request #1999 from hairyhenderson/json-use-number-during-migrate-1998
...
Fixing JSON marshaling of large numbers during migration
2015-10-19 15:12:20 -07:00
486e359e63
Fixing JSON marshaling of large numbers during migration
...
- Added some context to an error message - it's useful to know _which_
plugin failed when invoking the binary failed
- Replaced `json.Umarshal` with a `json.Decoder`, so that the
`UseNumber` function can be called, which prevents large integers from
being interpreted as `float64`s.
- Fixed a couple `log.Warn` calls that should've been `log.Warnf`
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-10-19 18:00:19 -04:00
447d262c06
Merge pull request #1939 from gmacario/fix-issue-1692
...
fix IPV6NetworkMaskPrefixLength value parsing
2015-10-19 14:17:51 -07:00
Olivier Gambier
David Gageot
Matt Bogosian
Nathan LeClaire
Nathan LeClaire
Mary Anthony
Chris Abernethy
Dave Henderson
feelobot