Jean-Laurent de Morlhon
fe37f1fb0d
Fix #2204 broken env unset
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-12 17:32:27 +01:00
David Gageot
9dd438e1f6
Merge pull request #2264 from dgageot/2255-fix-in-container-build
...
FIX #2255 - make cross should copy binaries
2015-11-12 16:20:21 +01:00
David Gageot
f38d8efb3b
Merge pull request #2268 from dgageot/ci
...
Build linux/darwin/windows on Travis
2015-11-12 16:17:06 +01:00
David Gageot
98abeddf3b
Fix cross-platform CI
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-12 15:07:14 +01:00
David Gageot
8f7ceb1c48
Add missing golang.org/x/sys dep.
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-12 15:06:24 +01:00
David Gageot
466d59d634
Simplify dep-restore target
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-12 15:05:57 +01:00
Jean-Laurent de Morlhon
40d153145f
Fix for #2244
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-12 13:49:43 +01:00
David Gageot
065b6976da
Merge pull request #2265 from dgageot/2262-ci-build-all-targets
...
Build on all platforms
2015-11-12 11:47:04 +01:00
David Gageot
e2410d435c
Run CI for linux/osx/windows
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-12 10:54:13 +01:00
David Gageot
3d72f50c61
FIX #2255 - make cross should copy binaries
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-12 09:53:58 +01:00
David Gageot
b90ffae460
Merge pull request #2261 from kunalkushwaha/master
...
BugFix: nil returned for string.
2015-11-12 08:51:51 +01:00
Kunal Kushwaha
23b5f8c99f
BugFix: nil retured for string.
...
Build break on windows. introduced with PR #2207
Signed-off-by: Kunal Kushwaha <kushwaha_kunal_v7@lab.ntt.co.jp>
2015-11-12 16:00:32 +09:00
David Gageot
5c5a004a77
Merge pull request #2239 from dgageot/faster-ci
...
Faster CI
2015-11-10 18:43:38 +01:00
David Gageot
ae027c355d
Merge pull request #2241 from dgageot/linting
...
Another pass at linting
2015-11-10 17:43:58 +01:00
Olivier Gambier
89d9854943
Another pass at linting
...
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-10 16:58:14 +01:00
David Gageot
72de87593b
test-long does run short tests
...
Signed-off-by: David Gageot <david@gageot.net>
2015-11-10 16:43:52 +01:00
David Gageot
1b7cfb0ce6
Faster in-container build.
...
Start the container only once
Signed-off-by: David Gageot <david@gageot.net>
2015-11-10 16:43:52 +01:00
David Gageot
fb986b23e0
Merge pull request #2207 from jeanlaurent/1737-virtualbox-installation-path
...
Fix #1737 - Detect non default VirtualBox Installation Path
2015-11-10 10:02:38 +01:00
Jean-Laurent de Morlhon
b6ca1035bd
Fix for #1737 - Better detect non default VirtualBox Installation Path
...
Signed-off-by: Jean-Laurent de Morlhon <jeanlaurent@morlhon.net>
2015-11-10 09:52:38 +01:00
David Gageot
7179139e16
Merge pull request #2233 from natemcmaster/patch-1
...
Update command-line arguments for hyper-v driver
2015-11-10 09:18:04 +01:00
Jean-Laurent de Morlhon
f3065ae771
Merge pull request #2235 from anthonydahanne/master
...
Fix typo : info, not version
2015-11-10 09:16:11 +01:00
Nathan LeClaire
2fe390babc
Update flag help explanation
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-09 23:26:40 -08:00
Anthony Dahanne
2a63a0ef53
Fix typo : info, not version
...
To retrieve the engine configuration
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com>
2015-11-09 15:51:28 -08:00
Nate McMaster
a43d13843b
Update command-line arguments for hyper-v driver
...
Signed-off-by: Nate McMaster <nate.mcmaster@gmail.com>
2015-11-09 14:55:34 -08:00
Nathan LeClaire
bc7da2b0fa
Merge pull request #2172 from dgageot/2154-query-virtualbox-serially
...
FIX #2154 query virtualbox serially
2015-11-09 12:00:03 -08:00
Olivier Gambier
93376828af
Merge pull request #2216 from nathanleclaire/plugin_stdout
...
Allow plugins to write to STDOUT
2015-11-07 14:00:12 -08:00
David Gageot
68092b3524
FIX #2154 query virtualbox serially
...
Signed-off-by: David Gageot <david@gageot.net>
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-07 16:14:25 +01:00
David Gageot
a5a53bfbdd
Merge pull request #2212 from nathanleclaire/b2d_regression
...
Fix boot2docker import regression
2015-11-07 16:13:11 +01:00
Olivier Gambier
3577ccda54
Merge pull request #2215 from nathanleclaire/newline_nit
...
Remove newline
2015-11-06 20:22:58 -08:00
Nathan LeClaire
b92a6fd3ce
Allow plugins to write to STDOUT
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-06 18:21:38 -08:00
Nathan LeClaire
a31808d07e
Remove newline
...
Infof adds it automatically.
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-06 18:18:06 -08:00
Nathan LeClaire
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
Olivier Gambier
6a646aeedf
Merge pull request #2208 from amir/master
...
Use rackspace's specialized client
2015-11-06 17:51:29 -08:00
Nathan LeClaire
a020c3eac7
Delete bridge after powering daemon down
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-06 17:49:33 -08:00
Nathan LeClaire
ad757310fb
Fix boot2docker import regression
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-06 17:10:41 -08:00
Amir Mohammad Saied
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
Olivier Gambier
9775f9ec04
Merge pull request #2202 from kunalkushwaha/master
...
BugFix: IP in template need as per Structure
2015-11-05 23:05:13 -08:00
David Gageot
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
Kunal Kushwaha
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
Nathan LeClaire
ac6a18ba25
Change none default state to Running
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com>
2015-11-05 18:37:15 -08:00
Nathan LeClaire
34f818527d
Merge pull request #2181 from dmp42/14-lint-harder
...
Lint, second pass
2015-11-05 15:25:10 -08:00
Olivier Gambier
436e85c150
Merge pull request #2191 from jviide/patch-1
...
Fix the local development environment instructions
2015-11-05 13:43:02 -08:00
Olivier Gambier
d2ada6488c
Lint
...
Signed-off-by: Olivier Gambier <olivier@docker.com>
2015-11-05 13:34:07 -08:00
jviide
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
Olivier Gambier
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
David Gageot
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
David Gageot
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
Mikhail Zholobov
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
David Gageot
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
David Gageot
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