dce2c8c9b7
Merge pull request #2946 from dhrp/doc-postgres-typo
...
Fixed some grammar and one other line in postgres example
Upstream-commit: de60bee3d4f34cdc61120463851fb996c4d8eb4c
Component: engine
2013-12-04 10:51:02 -08:00
55c7790d1c
Merge pull request #3000 from creack/improve_make_sh_test
...
Improve make sh test
Upstream-commit: 51b9fe73012e84d27dbf1361df61162d6bf6761c
Component: engine
2013-12-04 10:41:55 -08:00
06ae34a0b2
Merge pull request #3029 from pnasrat/container-refactoring
...
Container refactoring
Upstream-commit: 61aad8fc105ee58d585fc403647146acc3e10f09
Component: engine
2013-12-04 10:35:42 -08:00
e21c443f19
Extract volume bind, creation and external methods.
...
Make Start() slightly more readable.
Upstream-commit: 40fe9f581bd56bbcab9f231763cfac20e659d8c3
Component: engine
2013-12-03 18:58:31 -05:00
0171e1cc75
Merge pull request #2339 from shin-/private_reg_auth
...
Private registry auth
Upstream-commit: 258d707548619eae7517b39ff0bc9541ebec566c
Component: engine
2013-12-03 15:29:38 -08:00
7da5754161
Merge pull request #2930 from creack/docker-osx
...
Docker client on OSX
Upstream-commit: 99e4f5635368b25a505edc114d66061def7163fc
Component: engine
2013-12-03 15:27:21 -08:00
0c7bc6f2ce
Extract helper method for volume linking.
...
Makes this more readable.
Upstream-commit: 84f78d9cad4162ddfc1bccbe55402050123cb1c5
Component: engine
2013-12-03 17:35:54 -05:00
9d4980d1a7
Merge pull request #2999 from dotcloud/improve_progress_bars
...
Handle small screens
Upstream-commit: f8176de191aa4dff9277ae8a2a08d738932fca73
Component: engine
2013-12-03 14:24:40 -08:00
71ac3b3d2a
Handle small screens
...
Upstream-commit: f50fe14e13160c7c823613710a6fa12c9fc13bcb
Component: engine
2013-12-03 14:21:33 -08:00
b151598031
Merge pull request #3009 from silas/stream-logs
...
Add stream flag to logs command
Upstream-commit: 2fd76fc0b826524cd6d133fb8163cf6066b8ce03
Component: engine
2013-12-03 13:43:35 -08:00
d385113417
Rename logs -stream to logs -f
...
Upstream-commit: b699aee91f90b8390dfa6e8ef58e983fc8c4f3e5
Component: engine
2013-12-03 20:35:22 +00:00
05ddc4a077
Support TESTFLAGS
...
Upstream-commit: d21563ced3a24ebfc8a9b53e5ec687543f7b2979
Component: engine
2013-12-03 14:49:10 -05:00
27db2d038b
Handle 401 response in auth.Login() for authed private registries
...
Upstream-commit: 9be5db8704be5bda02484c374f4bd9b197d5701b
Component: engine
2013-12-03 16:32:13 +01:00
3959a8a4bc
Don't return req as result of setTokenAuth
...
Upstream-commit: 3f921639894d3eca72c9ae105d3ad4f386651caa
Component: engine
2013-12-03 16:32:13 +01:00
14f5d29204
missed one call to setTokenAuth
...
Upstream-commit: 3b5010e90bd51ba3630f48091ed70111d26dd31a
Component: engine
2013-12-03 16:32:13 +01:00
c52437abda
Factorized auth token setting
...
Upstream-commit: ec4863ae5582d8e7a9dccb57d7f5f3e21c2481ef
Component: engine
2013-12-03 16:32:13 +01:00
99feeadcbb
gofmt
...
Upstream-commit: a02bc8a5dbca763a2a245cf0ca17ff5a21d5b52b
Component: engine
2013-12-03 16:32:13 +01:00
37888fa7b4
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.
Upstream-commit: 045989e3d824f577cd90a6386b66a5814e703766
Component: engine
2013-12-03 16:32:13 +01:00
13eb2fe87b
Added HTTPAuthDecorator
...
Upstream-commit: bbf9135adcaec9edc2e9d0ebce6a78ba3ade3689
Component: engine
2013-12-03 16:24:47 +01:00
edb20bb130
Only stream logs when container is running
...
Upstream-commit: 3ddbb36a84d5530b1f6b496ff8d79ade6f539267
Component: engine
2013-12-03 07:17:07 +00:00
1b165a51bf
Add stream flag to logs command
...
Upstream-commit: 62263967b91ca841c43b980aec0ebc74ab2d838d
Component: engine
2013-12-03 06:18:01 +00:00
ae3478d13e
Merge pull request #2821 from jpellerin/2820-fix-daemon-dns
...
Fixes #2820
Upstream-commit: 3ed0ff85f52b211746ffa10d968e43b9e3f93416
Component: engine
2013-12-02 18:19:31 -08:00
2d52207a24
Merge pull request #3005 from gurjeet/zfs_driver_owner
...
Typo fix
Upstream-commit: 650d4cc64438bd6b1ae12f77aa98a663eec1b4bc
Component: engine
2013-12-02 15:06:05 -08:00
ff0ebd8660
Typo fix
...
Upstream-commit: d9b742419c48bfe57b16d7bf18915a9b31f3548d
Component: engine
2013-12-02 18:03:54 -05:00
247a658901
Add some color in order to emphasis the test FAILURE
...
Upstream-commit: 829b118dd8fbfb9ce1585c15699cf6221c328802
Component: engine
2013-12-02 14:54:01 -08:00
eb27ea66a2
Add unit test for ValidateIp4Address
...
Upstream-commit: 5a9cf7e75442ce1c76876da717b8c2f321fc04ae
Component: engine
2013-12-02 17:33:33 -05:00
ac96c6da33
Remove trailing whitespace
...
Upstream-commit: 0017c68f4a56f9250b53e4f8efdf3513b051c1a3
Component: engine
2013-12-02 13:52:27 -08:00
e3b038914a
Fixes #2820
...
Upstream-commit: 3cd9b2aadfd16736032ee569ba263fce53286347
Component: engine
2013-12-02 16:22:39 -05:00
349763ab43
Merge pull request #2998 from creack/fix_json_display
...
Fix json display
Upstream-commit: 8afb0abbee0ff135a5314d7078285378b8f49c93
Component: engine
2013-12-02 12:58:58 -08:00
eade1687a5
Fix unit test with new buildfile prototype
...
Upstream-commit: 98ed1dc433e423b93ae0619c5a2c474ccec1454d
Component: engine
2013-12-02 12:51:37 -08:00
0e8aae3193
Merge pull request #2959 from crosbymichael/fix-auth-split
...
Split auth on first colon
Upstream-commit: 7aec93c37094fa09631b13061553950088e9e6fa
Component: engine
2013-12-02 12:21:04 -08:00
1528c85fe3
Merge pull request #2965 from crosbymichael/no-private-port
...
Only return published ports for docker port
Upstream-commit: 62f0e5aef9726761cde5bc73abdf7c318102203e
Component: engine
2013-12-02 12:18:47 -08:00
5f09ff39ce
Merge pull request #2982 from tianon/dockerfile-best-practice
...
Update Dockerfile with all-caps INSTRUCTIONS
Upstream-commit: 59a85798fade8cbe39cac1c66ea210ec16132b61
Component: engine
2013-12-02 12:14:04 -08:00
f20cc21995
Merge pull request #2957 from creack/handle_sigquit
...
Catch SIGQUIT for cleanup
Upstream-commit: 67c03552f65e912550295e1dfc9498055ddd3ac9
Component: engine
2013-12-02 12:13:07 -08:00
4e6bccd97f
Merge pull request #2921 from dustin/inspect-format
...
Add -format to 'docker inspect'
Upstream-commit: 4fdc117ad2d5f9b212ac567db1e0e514016880d7
Component: engine
2013-12-02 12:08:15 -08:00
16982ec76d
small reformatting jsonmessage
...
Upstream-commit: 5cd09dc1158c62754641dce9c59a735c41e59722
Component: engine
2013-12-02 11:49:11 -08:00
134dbf8c6a
Fix displayJson behavior (dont add newline)
...
Upstream-commit: 6ea3b9651b3793e31a320926472ff23383a7b915
Component: engine
2013-12-02 11:47:13 -08:00
3412149ffe
Do not format at each write but use a Writer instead (build)
...
Upstream-commit: de4429f70d51056c3ec32072f3f18898e36171b3
Component: engine
2013-12-02 11:43:41 -08:00
4ad49ae63e
Merge pull request #2924 from tianon/strict-fhs-compatibility
...
Add proper dockerinit path support for distros that use FHS 2.3
Upstream-commit: 8cc524996a0d29a5b11a14ef17950193d45c1e05
Component: engine
2013-12-02 11:35:36 -08:00
0d9d61008f
Merge pull request #2995 from gurjeet/zfs_driver_owner
...
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
Upstream-commit: d9fbdd7b3f8e1507ed6f08ed99fab4d983108719
Component: engine
2013-12-02 11:10:16 -08:00
56e5aafa16
CLI docs and examples of format
...
Upstream-commit: 4ad3dfb05f1932793cae5c8047a89660747b95b4
Component: engine
2013-12-02 11:07:41 -08:00
b0a3ce1eef
Use inspect format to get IP address for psql example
...
Upstream-commit: 1d503be4660667a27b42f7bf0c089404cabd2c9c
Component: engine
2013-12-02 11:07:41 -08:00
c86bbee38a
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
Upstream-commit: 9837ad8e9b96b118e8d004e773a05ff9dd208b48
Component: engine
2013-12-02 11:07:41 -08:00
8b06459645
Add contrb/zfs/ and add self as maintainer of ZFS storage driver.
...
Upstream-commit: 70b586702cb1715d4ff4dd7ffe356285df73b18e
Component: engine
2013-12-02 14:03:16 -05:00
128e1b30b4
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
Upstream-commit: 4b35c1b6a6167a0dce11cd748c94598199dce942
Component: engine
2013-12-02 10:59:15 -08:00
26b3fb6752
Merge pull request #2829 from dotcloud/refactor_opts
...
Refactor opts
Upstream-commit: fe571dd29328efe5f5318c0b146d0aa5a66217a2
Component: engine
2013-12-02 10:41:30 -08:00
92e4ac1dc3
Merge pull request #2945 from dotcloud/refactor_stream
...
Refactor stream
Upstream-commit: e1414a4c3999362c97ad66ed1dd9cd64678df9af
Component: engine
2013-12-02 10:31:09 -08:00
3b9e303902
Merge pull request #2994 from discordianfish/1150-build-return-exit-code
...
Bump api version and update docs
Upstream-commit: d4ebba703c5d1f59f40469bd8afaecb514f1613c
Component: engine
2013-12-02 10:30:46 -08:00
fe4ba516d1
Bump api version and update docs
...
Upstream-commit: e4cb83c50e554bfd8ae3e0a1f2be4f0fb661861d
Component: engine
2013-12-02 19:27:28 +01:00
63272cdce4
Merge pull request #2981 from tianon/less-verbose-testing
...
Remove "-v" from "go test" (since it's easy to add back manually via TESTFLAGS)
Upstream-commit: d7dd19d22e92c19aec63fd1bd69b30109ed2a727
Component: engine
2013-12-02 10:14:25 -08:00
