34f818527d
Merge pull request #2181 from dmp42/14-lint-harder
...
Lint, second pass
2015-11-05 15:25:10 -08:00
436e85c150
Merge pull request #2191 from jviide/patch-1
...
Fix the local development environment instructions
2015-11-05 13:43:02 -08:00
d2ada6488c
Lint
...
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-05 13:34:07 -08:00
4b6455d395
Fix the local development environment instructions
...
Omit the docker-machine/ path prefix from the last cd command. Having followed the instructions the user should already be in the docker-machine directory.
Signed-off-by: Joachim Viide <jviide@iki.fi>
2015-11-05 23:21:45 +02:00
24da8ad7a8
Merge pull request #2185 from dgageot/2171-fix-flags
...
FIX #2171 issue with amazonec2-private-address-only
2015-11-05 10:36:32 -08:00
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
d07e4e259a
Merge pull request #2184 from legal90/fix-integration-tests
...
test/integration: Remove machine forcibly, without stopping
2015-11-05 18:29:56 +01:00
d07d443466
test/integration: Remove machine forcibly, without stopping
...
Unlikely "rm -f", commands "stop" and "rm" will be failed if machine doesn't exist.
Forced removing guarantees that integration tests won't fail on the cleanup step.
Signed-off-by: Mikhail Zholobov <legal90@gmail.com>
2015-11-05 12:35:25 +02:00
29a0ef6853
Merge pull request #2115 from dgageot/more-cleanup-for-more-tests
...
Add CommandLine interface for commands
2015-11-05 06:20:36 +01:00
99d6fe134d
Introduce CommandLine interface
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-05 06:07:57 +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
6be950f1c0
Merge pull request #2117 from dmp42/08-carry-on-2033
...
Carry on commits from #2033
2015-11-04 16:41:40 -08:00
828cb12e2c
Merge pull request #2177 from dmp42/13-lint-attempt-again
...
Lint, step 1
2015-11-04 15:29:52 -08:00
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
19fc49b58a
Lint, step 1
...
The easy stuff
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-04 14:17:58 -08:00
ab4b09bfb2
Merge pull request #2164 from dmp42/12-make-helper
...
Dependencies make helper
2015-11-04 09:23:09 -08:00
34ee11e51d
Merge pull request #2116 from dgageot/1628-oauth2
...
Move `goauth2/oauth` dependency to `golang.org/x/oauth2`
2015-11-04 08:54:20 -08:00
0836929470
Merge pull request #2165 from dgageot/maintainers
...
Add David to maintainers
2015-11-04 08:52:19 -08:00
afb1411608
Make updates
...
Added and documented two simple helpers to ease managing deps.
Removed now obsolete references to `grep -v Godeps`
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-04 08:45:27 -08:00
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
8ac6adc13b
Merge pull request #1879 from emsi/google-use-internal-ip
...
New option for create: --google-use-internal-ip
2015-11-04 10:38:03 +01:00
f3c5f05425
FIX #1628 Move to `golang.org/x/oauth2`
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-04 10:21:58 +01:00
840ed7cc15
Migrate Digital Ocean driver to oauth2
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-04 10:20:44 +01:00
d1712e0cd3
Introduced a new flag for google driver:
...
--google-use-internal-ip
Signed-off-by: Mariusz Woloszyn <emsi@EmsiOSX.dom.qpqp01.pl>
2015-11-04 09:10:29 +00:00
e7d595373c
Merge pull request #2066 from dgageot/2064-support-colons-in-scp-paths
...
Support colons in scp paths
2015-11-04 09:57:52 +01:00
8a452a9629
FIX #2064 Support local windows path
...
+ Use assert in tests
+ Improve parsing
+ Simplify code and tests
Signed-off-by: David Gageot <david@gageot.net>
2015-11-04 09:48:21 +01:00
10b94b5e3e
Merge pull request #2163 from dmp42/11-move-to-vendor
...
Move to vendor
2015-11-04 09:46:00 +01:00
7f5983b703
Merge pull request #2113 from dgageot/gce-custom-images
...
Fixes #1243 Custom GCE images support
2015-11-04 09:00:20 +01:00
bcf4767937
Add David to maintainers
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-04 08:54:39 +01:00
c9117af080
Move to vendor
...
As we walk away from 1.4, godep no longer requires to have stuff into workspace and we no longer need the symlink.
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-03 21:14:39 -08:00
b3e83da3e6
Cleanup and fix deps
...
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-03 21:07:34 -08:00
04cfa58445
Merge pull request #2152 from nathanleclaire/bump_0.5.0
...
Bump to v0.5.0
2015-11-03 12:20:26 -08:00
8153d432ce
Bump to v0.5.0
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-03 12:10:04 -08:00
c6d6eb863a
Merge pull request #2151 from todorez/fix-ip-clash
...
Fix DHCP server and host-only adapter IP address clash
2015-11-03 12:06:26 -08:00
786437901c
Merge pull request #2148 from nathanleclaire/no_driver_ls
...
Ensure that ls will still work when plugin cannot be found
2015-11-03 11:58:14 -08:00
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
36ca9c6063
Fix DHCP server and host-only adapter IP address clash
...
When setting up a host-only network we need to pass the IP address
of the host adapter (e.g 192.168.99.1) to the getRandomIPinSubnet function.
Passing the network address (e.g 192.168.1.0) can result in bypassing the IP
clash check and having the same address assigned to both the DHCP server
and the host-only network interface.
Signed-off-by: Todor Minchev <todor.minchev@linux.intel.com>
2015-11-03 11:26:31 -08:00
bccbe19a86
Merge pull request #2146 from nathanleclaire/rm_automatic_cert_regeneration
...
Remove automatic certificate regeneration
2015-11-02 22:14:22 -08:00
f3122dd853
Merge pull request #2099 from nathanleclaire/help_foobar
...
Smooth rough edges around create help text
2015-11-02 22:14:06 -08:00
f5b6c87e7c
Remove automatic certificate regeneration
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-02 19:31:29 -08:00
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
060f0a0db2
Fix issues with create and ssh command help text
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-30 16:21:47 -07:00
721f39d4af
Merge pull request #2128 from dgageot/2127-detect-hw-virtualization-issue-on-linux
...
FIX #2127 Detect that HW virtualization is not supported
2015-10-30 15:24:59 -07:00
be5fce87b6
Merge pull request #2133 from nathanleclaire/dgageot-2129-Driver-name-is-lost-in-migration
...
Fix DriverName missing in 0.3.1 => 0.5.0 migration
2015-10-30 14:54:10 -07:00
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
0176f05db8
FIX #2127 Detect that HW virtualization is not supported
...
Signed-off-by: David Gageot <david@gageot.net>
2015-10-30 16:19:38 +01:00
952539dd8a
Merge pull request #2120 from nathanleclaire/bump_0.5.0_rc4
...
Bump to RC4
2015-10-29 14:45:32 -07:00
670d03a1b4
Bump to RC4
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-10-29 14:23:06 -07:00
92d67ff13f
Merge pull request #850 from dudymas/feat/openstack-nova-ip-pools
...
feature to fix #737 - openstack driver can use nova to allocate floating ips
2015-10-29 12:33:43 -07:00
Nathan LeClaire
Olivier Gambier
Olivier Gambier
jviide
David Gageot
Mikhail Zholobov
Kunal Kushwaha
Jan Broer
root
Nathan LeClaire
Todor Minchev