Nick Stinemates
40c90796e9
Fix layout
2014-01-09 08:35:47 -08:00
Nick Stinemates
7fb55f7725
Removed the 5th clause
...
Removed clause which states contributions should be relicensed
2014-01-09 08:35:06 -08:00
Nick Stinemates
6fe3da9924
Remove the @github handle as it generates emails.
2014-01-06 17:21:14 -08:00
Nick Stinemates
36ab1836f9
Fix dotCloud to Docker, Inc
2014-01-06 12:26:53 -08:00
Nick Stinemates
8f382aaecd
Merged with master
2013-12-04 12:40:54 -08:00
Victor Vieux
1b5517b68f
Merge pull request #3046 from dotcloud/fix_offline_image_transfert_jsonmessage
...
Fix offline image transfer jsonmessage
2013-12-04 12:05:28 -08:00
Victor Vieux
4bc100b494
fix jsonmessage
2013-12-04 11:57:18 -08:00
Victor Vieux
be282b57d5
fix offline image transfert
2013-12-04 11:55:42 -08:00
Victor Vieux
12180948be
remove unused parameter in Download
2013-12-04 11:54:11 -08:00
Victor Vieux
6cf2c14c00
Merge pull request #2796 from EmilHernvall/master
...
Support for same port on multiple interfaces
2013-12-04 11:15:51 -08:00
Michael Crosby
dc9f8bf072
Merge pull request #2790 from proppy/fix-tar
...
utils: remove dotcloud/tar dep
2013-12-04 11:06:13 -08:00
Michael Crosby
0862756beb
Merge pull request #3018 from pnasrat/3017-debug-expvar
...
Expose expvar endpoint during debugging.
2013-12-04 10:53:35 -08:00
Andy Rothfusz
de60bee3d4
Merge pull request #2946 from dhrp/doc-postgres-typo
...
Fixed some grammar and one other line in postgres example
2013-12-04 10:51:02 -08:00
Michael Crosby
51b9fe7301
Merge pull request #3000 from creack/improve_make_sh_test
...
Improve make sh test
2013-12-04 10:41:55 -08:00
Michael Crosby
61aad8fc10
Merge pull request #3029 from pnasrat/container-refactoring
...
Container refactoring
2013-12-04 10:35:42 -08:00
Paul Nasrat
40fe9f581b
Extract volume bind, creation and external methods.
...
Make Start() slightly more readable.
2013-12-03 18:58:31 -05:00
Sam Alba
258d707548
Merge pull request #2339 from shin-/private_reg_auth
...
Private registry auth
2013-12-03 15:29:38 -08:00
Victor Vieux
99e4f56353
Merge pull request #2930 from creack/docker-osx
...
Docker client on OSX
2013-12-03 15:27:21 -08:00
Paul Nasrat
84f78d9cad
Extract helper method for volume linking.
...
Makes this more readable.
2013-12-03 17:35:54 -05:00
Victor Vieux
f8176de191
Merge pull request #2999 from dotcloud/improve_progress_bars
...
Handle small screens
2013-12-03 14:24:40 -08:00
Victor Vieux
f50fe14e13
Handle small screens
2013-12-03 14:21:33 -08:00
Victor Vieux
2fd76fc0b8
Merge pull request #3009 from silas/stream-logs
...
Add stream flag to logs command
2013-12-03 13:43:35 -08:00
Silas Sewell
b699aee91f
Rename logs -stream to logs -f
2013-12-03 20:35:22 +00:00
Michael Crosby
7428e6a5f0
Merge pull request #3022 from pnasrat/3021-makefile-testflags
...
Support TESTFLAGS
2013-12-03 10:55:22 -08:00
Paul Nasrat
d21563ced3
Support TESTFLAGS
2013-12-03 14:49:10 -05:00
Paul Nasrat
6a55169e2e
Expose expvar endpoint during debugging.
...
Fixes #3017
2013-12-03 13:04:18 -05:00
shin-
9be5db8704
Handle 401 response in auth.Login() for authed private registries
2013-12-03 16:32:13 +01:00
shin-
3f92163989
Don't return req as result of setTokenAuth
2013-12-03 16:32:13 +01:00
shin-
3b5010e90b
missed one call to setTokenAuth
2013-12-03 16:32:13 +01:00
shin-
ec4863ae55
Factorized auth token setting
2013-12-03 16:32:13 +01:00
shin-
a02bc8a5db
gofmt
2013-12-03 16:32:13 +01:00
shin-
045989e3d8
Use basic auth for private registries when over HTTPS.
...
RequestFactory is no longer a singleton (can be different for different instances of Registry)
Registry now has an indexEndpoint member
Registry methods that needed the indexEndpoint parameter no longer do so
Registry methods will only use token auth where applicable if basic auth is not enabled.
2013-12-03 16:32:13 +01:00
shin-
bbf9135adc
Added HTTPAuthDecorator
2013-12-03 16:24:47 +01:00
Emil Hernvall
1cb1e08644
Support for same port on multiple interfaces
...
This commit improves upon the PortMapper and PortAllocator classes by changing
their internal data structures for port allocations to use a string rather than
a single integer. This string holds the network interface address as well as the
port number. This solves a previous problem where a port would be incorrectly
reported as being in use because it had been allocated for a different interface.
I've also added a basic test case for the PortMapper class, and extended the
existing test case for PortAllocator. In the case of PortMapper, this is done
by handing it a stub function for creating proxies rather than an actual
implementation.
2013-12-03 15:14:54 +01:00
Silas Sewell
3ddbb36a84
Only stream logs when container is running
2013-12-03 07:17:07 +00:00
Silas Sewell
62263967b9
Add stream flag to logs command
2013-12-03 06:18:01 +00:00
Michael Crosby
3ed0ff85f5
Merge pull request #2821 from jpellerin/2820-fix-daemon-dns
...
Fixes #2820
2013-12-02 18:19:31 -08:00
Tianon Gravi
650d4cc644
Merge pull request #3005 from gurjeet/zfs_driver_owner
...
Typo fix
2013-12-02 15:06:05 -08:00
Gurjeet Singh
d9b742419c
Typo fix
2013-12-02 18:03:54 -05:00
Guillaume J. Charmes
829b118dd8
Add some color in order to emphasis the test FAILURE
2013-12-02 14:54:01 -08:00
JP
5a9cf7e754
Add unit test for ValidateIp4Address
2013-12-02 17:33:33 -05:00
Guillaume J. Charmes
0017c68f4a
Remove trailing whitespace
2013-12-02 13:52:27 -08:00
JP
3cd9b2aadf
Fixes #2820
2013-12-02 16:22:39 -05:00
Victor Vieux
8afb0abbee
Merge pull request #2998 from creack/fix_json_display
...
Fix json display
2013-12-02 12:58:58 -08:00
Guillaume J. Charmes
98ed1dc433
Fix unit test with new buildfile prototype
2013-12-02 12:51:37 -08:00
Victor Vieux
7aec93c370
Merge pull request #2959 from crosbymichael/fix-auth-split
...
Split auth on first colon
2013-12-02 12:21:04 -08:00
Victor Vieux
62f0e5aef9
Merge pull request #2965 from crosbymichael/no-private-port
...
Only return published ports for docker port
2013-12-02 12:18:47 -08:00
Victor Vieux
59a85798fa
Merge pull request #2982 from tianon/dockerfile-best-practice
...
Update Dockerfile with all-caps INSTRUCTIONS
2013-12-02 12:14:04 -08:00
Victor Vieux
67c03552f6
Merge pull request #2957 from creack/handle_sigquit
...
Catch SIGQUIT for cleanup
2013-12-02 12:13:07 -08:00
Victor Vieux
4fdc117ad2
Merge pull request #2921 from dustin/inspect-format
...
Add -format to 'docker inspect'
2013-12-02 12:08:15 -08:00
