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
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
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
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
JP
5a9cf7e754
Add unit test for ValidateIp4Address
2013-12-02 17:33:33 -05: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
Guillaume J. Charmes
5cd09dc115
small reformatting jsonmessage
2013-12-02 11:49:11 -08:00
Guillaume J. Charmes
6ea3b9651b
Fix displayJson behavior (dont add newline)
2013-12-02 11:47:13 -08:00
Guillaume J. Charmes
de4429f70d
Do not format at each write but use a Writer instead (build)
2013-12-02 11:43:41 -08:00
Michael Crosby
8cc524996a
Merge pull request #2924 from tianon/strict-fhs-compatibility
...
Add proper dockerinit path support for distros that use FHS 2.3
2013-12-02 11:35:36 -08:00
Tianon Gravi
d9fbdd7b3f
Merge pull request #2995 from gurjeet/zfs_driver_owner
...
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
2013-12-02 11:10:16 -08:00
Dustin Sallings
4ad3dfb05f
CLI docs and examples of format
2013-12-02 11:07:41 -08:00
Dustin Sallings
1d503be466
Use inspect format to get IP address for psql example
2013-12-02 11:07:41 -08:00
Dustin Sallings
9837ad8e9b
Add -format to 'docker inspect'
...
This makes it a lot easier to script with docker instances as one can
ask for details about running instances more easily without having to
have additional JSON processing tools installed.
dotcloud/docker#734
2013-12-02 11:07:41 -08:00
Gurjeet Singh
70b586702c
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
2013-12-02 14:03:16 -05:00
Victor Vieux
4b35c1b6a6
Merge pull request #2728 from SvenDowideit/docker-import-doc
...
re-word the help for docker import to make it clear that this will be an empty image containing only the files in the tar file
2013-12-02 10:59:15 -08:00
Michael Crosby
fe571dd293
Merge pull request #2829 from dotcloud/refactor_opts
...
Refactor opts
2013-12-02 10:41:30 -08:00
Michael Crosby
e1414a4c39
Merge pull request #2945 from dotcloud/refactor_stream
...
Refactor stream
2013-12-02 10:31:09 -08:00
Victor Vieux
d4ebba703c
Merge pull request #2994 from discordianfish/1150-build-return-exit-code
...
Bump api version and update docs
2013-12-02 10:30:46 -08:00
Johannes 'fish' Ziemke
e4cb83c50e
Bump api version and update docs
2013-12-02 19:27:28 +01:00
Michael Crosby
d7dd19d22e
Merge pull request #2981 from tianon/less-verbose-testing
...
Remove "-v" from "go test" (since it's easy to add back manually via TESTFLAGS)
2013-12-02 10:14:25 -08:00
Guillaume J. Charmes
5f2313aad3
Merge pull request #2984 from SvenDowideit/2319-build-check-for-dockerfile
...
check on the client side that there is a Dockerfile
2013-12-02 09:35:31 -08:00
Guillaume J. Charmes
d6cdbca6c1
Merge pull request #2775 from daniel-garcia/2671-bindmount_files
...
fixes #2671 , add support for bind mounting individual files in to contai...
2013-12-02 09:30:08 -08:00
Guillaume J. Charmes
751250015b
Merge pull request #2206 from discordianfish/1150-build-return-exit-code
...
Make docker build return exit code of build step
2013-12-02 09:01:11 -08:00
Johannes 'fish' Ziemke
b04c6466cd
Make docker build return exit code of build step
...
If a command during build fails, `docker build` now returns with
the exit code of that command.
This makes it necessary to change the build api endpoint to
return a json object stream.
2013-12-02 17:52:37 +01:00
Solomon Hykes
c4548506c5
Merge pull request #2693 from fkautz/makefile
...
Adding a makefile
2013-12-01 23:25:24 -08:00
Sven Dowideit
26cf8b9aff
check on the client side that there is a Dockerfile, so we don't upload a huge stack of files, only to realise we can't do anything
2013-12-02 15:55:08 +10:00