Commit Graph

1603 Commits

Author SHA1 Message Date
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
Olivier Gambier de5d052985 Merge pull request #2044 from nathanleclaire/minor_docs_fix
Fix ordered list numbering
2015-10-21 13:18:57 -07:00
Nathan LeClaire 70dfc1e4db Fix ordered list numbering
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-21 12:51:28 -07:00
Nathan LeClaire 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
Olivier Gambier a21e8f1892 Merge pull request #2043 from dgageot/report-virtual-box-errors
Report VirtualBox errors
2015-10-21 12:19:54 -07:00
David Gageot 6bbec2df68 Report VirtualBox errors
Signed-off-by: David Gageot <david@gageot.net>
2015-10-21 21:03:51 +02:00
Nathan LeClaire 97fcc446d7 Merge pull request #2038 from dgageot/brownoxford-validate-cidr
Additional validation on virtualbox-hostonly-cidr
2015-10-21 11:54:48 -07:00
Mary Anthony 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
Chris Abernethy 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
Nathan LeClaire 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
Olivier Gambier 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
David Gageot 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
Olivier Gambier 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
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
Olivier Gambier e4f0e66cb7 Merge pull request #1449 from hairyhenderson/arch-provisioner-1293
Adding provisioner for Arch Linux
2015-10-20 19:29:02 -07:00
Dave Henderson e2856e36f4 Adding support for darwin to IsVTXDisabled
Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-10-20 21:20:40 -04: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
Olivier Gambier 4c5615c5e4 Merge pull request #1976 from dgageot/add-tests-virtualbox-driver
Add tests to virtualbox driver
2015-10-20 10:28:53 -07:00
Olivier Gambier 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
David Gageot 94361315a8 Add tests to virtualbox driver
Signed-off-by: David Gageot <david@gageot.net>
2015-10-20 19:08:18 +02:00
Olivier Gambier 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
Olivier Gambier e959f7f1df Merge pull request #2026 from dgageot/fix-integration-tests
Fix Typos in integration tests
2015-10-20 09:47:23 -07:00
David Gageot 3ab5520ea3 Fix Typos in integration tests
Signed-off-by: David Gageot <david@gageot.net>
2015-10-20 17:56:27 +02:00
David Gageot 9c8b4e0da3 FIX #1974 in-container make test fails
Signed-off-by: David Gageot <david@gageot.net>
2015-10-20 14:56:07 +02:00
David Gageot 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
Nathan LeClaire 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
Nathan LeClaire 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
Nathan LeClaire 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
Nathan LeClaire 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
Nathan LeClaire 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
Nathan LeClaire 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
Nathan LeClaire 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
Nathan LeClaire 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
Nathan LeClaire 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
Dave Henderson 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
Nathan LeClaire 447d262c06 Merge pull request #1939 from gmacario/fix-issue-1692
fix IPV6NetworkMaskPrefixLength value parsing
2015-10-19 14:17:51 -07:00
Nathan LeClaire b818d3f7e8 Merge pull request #2000 from hairyhenderson/fix-non-logf-method-calls
💄Fix log.* method calls which meant to be log.*f
2015-10-19 13:04:33 -07:00
Olivier Gambier aebd037c46 Merge pull request #2003 from blaggacao/patch-1
Close #2001 / consistent hyperv internal naming
2015-10-19 11:40:15 -07:00
David Arnold ab79c4d9c1 Close #2001 / consistent hyperv internal naming
Signed-off-by: David Arnold <dar@devco.co>
2015-10-18 11:53:39 -05:00
Dave Henderson 2a6e3dbf40 Fix log.* method calls which meant to be log.*f
Stuff like `log.Debug("foo bar: %s", baz)` really wants to be
`log.Debugf("foo bar: %s", baz)`...

Signed-off-by: Dave Henderson <dhenderson@gmail.com>
2015-10-17 15:59:25 -04:00
Nathan LeClaire 43543d1579 Merge pull request #1997 from nathanleclaire/bump_for_rc
Bump version for release candidate
2015-10-16 18:00:23 -07:00
Nathan LeClaire 581198de1b Bump version for release candidate
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-16 17:53:58 -07:00
Nathan LeClaire 8aa1572e0d Merge pull request #1902 from nathanleclaire/plugins
Add Docker Machine driver plugins
2015-10-16 16:41:29 -07:00
Nathan LeClaire c8edb33ecd Move towards using external binaries / RPC plugins
- First RPC steps

- Work on some flaws in RPC model

- Remove unused TLS settings from Engine and Swarm options

- Add code to correctly encode data over the network

- Add client driver for RPC

- Rename server driver file

- Start to make marshal make sense

- Fix silly RPC method args and add client

- Fix some issues with RPC calls, and marshaling

- Simplify plugin main.go

- Move towards 100% plugin in CLI

- Ensure that plugin servers are cleaned up properly

- Make flag parsing for driver flags work properly

Includes some work carried from @dmp42 updating the build process and
tests to use the new method.

Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-16 16:34:56 -07:00
Nathan LeClaire a63f26f438 Merge pull request #1991 from dmp42/01-carry-on-build-tweaks
Add simpler make targets and fix Windows build
2015-10-15 16:43:01 -07:00
Nathan LeClaire 600ffb7d20 Merge pull request #1968 from cmouttet/1967-openstack_InstanceIpAddress_default
add default AddressType: Fixed
2015-10-15 14:19:54 -07:00
Olivier Gambier 3e2e3d0a59 Build system enhancements
- new simpler targets:
 * make machine
 * make plugins
 * make cross
- fixed windows cross build to output .exe files

Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-10-15 13:26:45 -07:00
Olivier Gambier 53ace516a4 Merge pull request #1960 from dgageot/1914-create-ignores-trailing-options
FIX #1914 Reject command lines with trailing flags
2015-10-14 10:28:38 -07:00