a5a53bfbdd
Merge pull request #2212 from nathanleclaire/b2d_regression
...
Fix boot2docker import regression
2015-11-07 16:13:11 +01:00
3577ccda54
Merge pull request #2215 from nathanleclaire/newline_nit
...
Remove newline
2015-11-06 20:22:58 -08:00
b92a6fd3ce
Allow plugins to write to STDOUT
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-06 18:21:38 -08:00
a31808d07e
Remove newline
...
Infof adds it automatically.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-06 18:18:06 -08:00
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
6a646aeedf
Merge pull request #2208 from amir/master
...
Use rackspace's specialized client
2015-11-06 17:51:29 -08:00
a020c3eac7
Delete bridge after powering daemon down
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-06 17:49:33 -08:00
ad757310fb
Fix boot2docker import regression
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-06 17:10:41 -08:00
a6c44f5d4e
Use rackspace's specialized client
...
`openstack.NewDerivedDriver` sets client to `openstack.GenericClient`
therefore `rackspace.Client` is getting ignored.
`rackspace.Client.Authenticate` has different semantics than
`openstack.GenericClient.Authenticate`, thus almost all operations with
`rackspace` driver fail at the moment.
Signed-off-by: Amir Mohammad Saied <amirsaied@gmail.com>
2015-11-06 18:30:31 +00:00
9775f9ec04
Merge pull request #2202 from kunalkushwaha/master
...
BugFix: IP in template need as per Structure
2015-11-05 23:05:13 -08:00
4ac76457f9
Merge pull request #2199 from nathanleclaire/none_running
...
Change default state of none driver to state.Running
2015-11-06 07:59:49 +01:00
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
ac6a18ba25
Change none default state to Running
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-05 18:37:15 -08:00
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
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
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
David Gageot
Olivier Gambier
Nathan LeClaire
Nathan LeClaire
Amir Mohammad Saied
Kunal Kushwaha
Olivier Gambier
jviide
Mikhail Zholobov
Jan Broer
root