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
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
eb27ea66a2
Add unit test for ValidateIp4Address
...
Upstream-commit: 5a9cf7e75442ce1c76876da717b8c2f321fc04ae
Component: engine
2013-12-02 17:33:33 -05: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
f91ba66458
Merge pull request #2984 from SvenDowideit/2319-build-check-for-dockerfile
...
check on the client side that there is a Dockerfile
Upstream-commit: 5f2313aad396a7cf5750fd5c13236bc5b81b8026
Component: engine
2013-12-02 09:35:31 -08:00
8118fea381
Merge pull request #2775 from daniel-garcia/2671-bindmount_files
...
fixes #2671 , add support for bind mounting individual files in to contai...
Upstream-commit: d6cdbca6c118a1022f6cb4cd5e260a01aa342009
Component: engine
2013-12-02 09:30:08 -08:00
85e4b81e0c
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.
Upstream-commit: b04c6466cdc89a107879af7a22b0917006b38730
Component: engine
2013-12-02 17:52:37 +01:00
ecb0056c78
Merge pull request #2693 from fkautz/makefile
...
Adding a makefile
Upstream-commit: c4548506c5be239b5dcb14291434bdaadef2d963
Component: engine
2013-12-01 23:25:24 -08:00
66b887f55d
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
...
Upstream-commit: 26cf8b9aff1cffa7c3e3ae7e720c960ff545ee78
Component: engine
2013-12-02 15:55:08 +10:00
c7e970855b
Update Dockerfile with all-caps INSTRUCTIONS (as explained in docs as being "convention": http://docs.docker.io/en/latest/use/builder/#format )
...
Upstream-commit: 7f1a91121c3f77ca833f43693018f6cce32b96bf
Component: engine
2013-12-01 21:31:28 -07:00
f474881303
Remove "-v" from "go test" (since it's easy to add back via TESTFLAGS)
...
Upstream-commit: c30e2dc28c53664a4ad241a682355332af3371d2
Component: engine
2013-12-01 21:20:35 -07:00
44554632a3
Update to Go 1.2 officially, now that it is released
...
Upstream-commit: 5c5f6709017575b0b090cb5f76b75e7e733ffa2b
Component: engine
2013-12-01 15:11:10 -07:00
5d92296f82
Minor fixes based on discussions on #2693
...
* Volume exports ./bundles instead of root directory
* Documents build using docker-docs instead of docker:docs
* Bundles directory is created before running build or docs
Upstream-commit: 56ab9cb0d5169401616acc7a396e9f4af00ed670
Component: engine
2013-11-30 00:09:41 -08:00
c3f280e495
Merge pull request #2925 from tianon/update-systemd-service
...
Update systemd service file with suggestions from @seblu
Upstream-commit: d8ee08ba7b5885352641b8ec6a9b427fb9bef62f
Component: engine
2013-11-29 21:25:08 -08:00
9ddc2663be
Merge branch 'master' into handle_sigquit
...
Conflicts:
server.go
Upstream-commit: 4e030c78d21f01c3b15e0f360ab7ffcf53918bea
Component: engine
2013-11-29 18:51:32 -08:00
2c50a80ad5
Merge pull request #2926 from crosbymichael/attach-wait
...
Return process exit code for attach
Upstream-commit: 62b1faf28c25a678a50f59251cccd2316239cc4a
Component: engine
2013-11-29 18:49:24 -08:00
3d5cd2c032
Merge pull request #2781 from shykes/engine-status-int
...
Engine: integer status, better streaming, lots of tests
Upstream-commit: 2dac7b5209d1b7926889c8ecc04ec984fc73865f
Component: engine
2013-11-29 17:57:28 -08:00
5658618c30
Only return published ports for docker port
...
Upstream-commit: 65db62619c8ae61c9735cb2a433adac7731256a5
Component: engine
2013-11-29 16:45:20 -08:00
3692eceab9
Fix a bug in Output.Write, and improve testing coverage of error cases.
...
Upstream-commit: 35d54c665575d48954db9422702c0324f00ebc62
Component: engine
2013-11-30 00:25:46 +00:00
b5aa8a6224
Engine: better testing of streams and of basic engine primitives. Coverage=81.2%
...
Upstream-commit: 3553a803e3a474207296f5542182ecbc569ca1d8
Component: engine
2013-11-30 00:25:46 +00:00
b0f24a88da
Engine: integer job status, improved stream API
...
* Jobs return an integer status instead of a string
* Status convention mimics unix process execution: 0=success, 1=generic error, 127="no such command"
* Stdout and Stderr support multiple thread-safe data receivers and ring buffer filtering
Upstream-commit: a4f8a2494b0fb755db52c68cf61ddc8ff52d2965
Component: engine
2013-11-30 00:25:46 +00:00
