f3325976cc
Increase upstart kill timeout to 20 seconds
...
Give Docker more time to kill containers before upstart kills Docker.
The default kill timeout is 5 seconds.
This will help decrease the chance of but not eliminate the chance of
orphaned container processes.
Signed-off-by: David Xia <dxia@spotify.com >
Upstream-commit: 2f9e7a067a7273a0f344c1c9a6397e4bb61d7554
Component: engine
2015-05-20 14:20:46 -04:00
c2ea54a24b
Merge pull request #13356 from LK4D4/test_double_nethost
...
Test for two containers in --net=host
Upstream-commit: c6d9c904af26ce4855069d9fb0bd2d8312cb18ce
Component: engine
2015-05-20 13:17:16 -04:00
7bb1c9e819
Test for two containers in --net=host
...
This is test for regression which was encountered during libnetwork
merging.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 7e5902c92d9a01d653a97685376def427e1f0750
Component: engine
2015-05-20 09:35:28 -07:00
6cea31194f
Fix wording in comment
...
Signed-off-by: Jacob Atzen <jatzen@gmail.com >
Upstream-commit: 007269ba2405bd95c73343513f6ef9a7b2772da0
Component: engine
2015-05-20 18:03:46 +02:00
05bb027603
Merge pull request #13347 from fntlnz/13184-remove-delete-container
...
Removed deleteContainer calls
Upstream-commit: c696993452636acfbed44da29ebd4c2554a5054d
Component: engine
2015-05-20 07:18:41 -07:00
2424680011
Merge pull request #13328 from icecrime/10662-registryfix-carry
...
Windows: fix registry filepath and location
Upstream-commit: 37e4d402283884c54a10d585042c6e3d24a9093c
Component: engine
2015-05-20 10:09:46 -04:00
e61b33bc5e
Removed deleteContainer calls
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com >
Upstream-commit: 086b514f6afb1eacc0683baa3472c80022f6e7e2
Component: engine
2015-05-20 08:38:23 +02:00
6f9f58e9c5
Merge pull request #13214 from zoechi/master
...
add bwu_docker
Upstream-commit: a09dfbcaad82c8e483189e5966fdff6146105965
Component: engine
2015-05-20 13:43:16 +10:00
3e16398646
Merge pull request #13315 from SvenDowideit/add-kitematic-docs
...
Add Kitematic documentation to docs.master.docker.com
Upstream-commit: a057accb594f3cce0cd6e158050b328ab698cc17
Component: engine
2015-05-20 12:27:33 +10:00
f475565e21
Add Kitematic documentation to docs.master.docker.com
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
Upstream-commit: 82bd3886d54da4fcbcd29cde957568a75ecd186e
Component: engine
2015-05-20 01:57:45 +00:00
03f7a130a4
Merge pull request #13325 from LK4D4/cleanup_mounts
...
Fix Put without Get in overlay
Upstream-commit: d29dc0b608f106ed589d25117abbbba3f5157bfe
Component: engine
2015-05-20 03:11:58 +02:00
6f37ffc9e3
Removed dead code from docker after libnetwork integration
...
As part of this some generic packages like iptables, etchosts and resolvconf
have also been moved to libnetwork. Even though they can still be
consumed in a generic fashion they will reside and be maintained
from within the libnetwork project.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: f12f51b8b934c21621c17590f1d526377a297a0d
Component: engine
2015-05-19 22:40:55 +00:00
13426de5e6
Docker integration with libnetwork
...
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
- Reworked daemon to allocate network resources using libnetwork.
- Reworked remove link code to also update network resources in libnetwork.
- Adjusted the exec driver command population to reflect libnetwork design.
- Adjusted the exec driver create command steps.
- Updated a few test cases to reflect the change in design.
- Removed the dns setup code from docker as resolv.conf is entirely managed
in libnetwork.
- Integrated with lxc exec driver.
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: d18919e304c240df84502cdcc5ed655d92d12d4f
Component: engine
2015-05-19 22:40:19 +00:00
769fee3fba
Vendoring in libnetwork, netns, netlink
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: 272f8cd4bc537bd78e7bf02d5b06fac50afda8ff
Component: engine
2015-05-19 22:40:18 +00:00
9fdf0d75ef
Merge pull request #13332 from LK4D4/fix_race_in_rand
...
Use goroutine-safe version of rand.Source
Upstream-commit: 322f675123681f6196dafdb6263fd34519e8ecbc
Component: engine
2015-05-19 14:20:33 -07:00
f0cacf3e79
Merge pull request #12437 from fmzhen/remove-regex-replace
...
Removal of the regex to replace ips
Upstream-commit: 92c869cd12313c8832584c1eb671577d070f8a5b
Component: engine
2015-05-19 22:59:17 +02:00
cad260f007
Merge pull request #13119 from psankar/master
...
Followup commit to https://github.com/docker/docker/pull/12986
Upstream-commit: 4a743c39dd156c19310dc254e67113bc07325994
Component: engine
2015-05-19 13:14:20 -07:00
5deb9f980a
Use goroutine-safe version of rand.Source
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: d8661250e71a60f053f575496d2b66d704549d6e
Component: engine
2015-05-19 12:32:40 -07:00
0f0f3f437f
Windows: fix registry filepath and location
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 81e7d3571be357205fc7ab65012771cadc2a967b
Component: engine
2015-05-19 10:58:45 -07:00
249d122d71
Merge pull request #12884 from Microsoft/10662-startcontainerrefactor
...
Windows: Refactor container
Upstream-commit: 0cc5da0635880245420333d6ec43cea75f2f3afd
Component: engine
2015-05-19 10:44:23 -07:00
f077c776e0
Merge pull request #13265 from tiborvass/refactor-v1-auth
...
registry: Refactor requestfactory to use http.RoundTrippers
Upstream-commit: a16b2ab274e076b019e8af4dfb50491d69917e77
Component: engine
2015-05-19 09:57:34 -07:00
7ad625cdc4
Merge pull request #13258 from unclejack/fix_build_network
...
builder/internals: set up network as bridge
Upstream-commit: ea4f43c2fa7a935e041a0b66dc9151d2474c6f18
Component: engine
2015-05-19 09:36:03 -07:00
8911352f54
Fix Put without Get in overlay
...
It is called for example on daemon start after crash
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 3916561619d45a3d8ca17dfa467149824111023a
Component: engine
2015-05-19 09:32:23 -07:00
881a75dcdf
Merge pull request #13238 from hqhq/hq_fix_usingdocker_md
...
Remove wrong usage in usingdocker.md
Upstream-commit: 6f4b808f415bd762a1090215cc73f66f49e52845
Component: engine
2015-05-19 09:24:31 -07:00
82047fce6d
Remove wrong usage in usingdocker.md
...
Fixes: https://github.com/docker/docker/issues/13235
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: f46cf7329507351e107e3a84132f14ed02dc163b
Component: engine
2015-05-19 13:07:41 +08:00
04b3252768
Add transport package to support CancelRequest
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 73823e5e56446b23ce01bb8e44a9670ab2552b0a
Component: engine
2015-05-18 23:31:42 -04:00
6da53b0de7
clean some redundant else clauses
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: d91ae65280c789307ec67fff7e2d268afe3aeba7
Component: engine
2015-05-19 10:54:04 +08:00
2d7bfa2f2c
Removal of the regex to replace ips
...
Signed-off-by: Mingzhen Feng <fmzhen@zju.edu.cn >
Upstream-commit: 3ab7ceb5d7aaa5fc04af98aae4115201ebae13ee
Component: engine
2015-05-19 10:15:18 +08:00
a10bf833ac
requestdecorator: repurpose the package and rename to useragent
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: cf8c0d0f56021fbea7bc89e378bb937b53aeca3b
Component: engine
2015-05-18 21:51:54 -04:00
14d2347fac
registry: Refactor requestfactory to use http.RoundTrippers
...
This patch removes the need for requestFactories and decorators
by implementing http.RoundTripper transports instead.
It refactors some challenging-to-read code.
NewSession now takes an *http.Client that can already have a
custom Transport, it will add its own auth transport by wrapping
it.
The idea is that callers of http.Client should not bother
setting custom headers for every handler but instead it should
be transparent to the callers of a same context.
This patch is needed for future refactorings of registry,
namely refactoring of the v1 client code.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: a01cc3ca7729c3ce635fef7c1db837b5c6ae1028
Component: engine
2015-05-18 21:51:53 -04:00
038196ed40
Merge pull request #13219 from brahmaroutu/gccgo_compile_issue
...
fix to gccgo compilation error
Upstream-commit: 472538bee00d0c665ed43ff1a3db7531a8e28d65
Component: engine
2015-05-18 20:43:47 -04:00
a7fe46a565
Merge pull request #13189 from alvinr/mongodb-fixup
...
Fixup MongoDB changes to line up with MongoDB 3.0 release
Upstream-commit: 6a18412d5b9c9fae7d7f3ab13eab44e0e4906124
Component: engine
2015-05-18 15:22:41 -07:00
7f04f5c4bf
Increase default connection timeout to 30s
...
Closes #13307
Signed-off-by: James Lal <jlal@mozilla.com >
Upstream-commit: f5e6f50a1ef193c1f3f5736829a0284c8f96a661
Component: engine
2015-05-18 13:26:33 -07:00
e1c50ccb66
Bring MongoDB examples up to date with 3.0 release
...
Signed-off-by: Alvin Richards <alvin.richards@docker.com >
Upstream-commit: 3f37afe0b98919b91bffb0f90abe2d25a5ead989
Component: engine
2015-05-18 13:08:31 -07:00
2b5ebf7133
Merge pull request #13282 from duglin/RemoveBash
...
Remove use of 'bash' from our tests
Upstream-commit: aac645ae047601fed1550c9d59d7c8ea978203b0
Component: engine
2015-05-18 13:06:21 -07:00
1ea64dbe6e
Merge pull request #13279 from hqhq/hq_use_inspectfield
...
Use inspectField to simplify code
Upstream-commit: ccf02a9f77be7732f65fe435281cea192e6abcad
Component: engine
2015-05-18 14:53:37 -04:00
073f78693b
Merge pull request #13204 from chenhanxiao/gitignore
...
gitignore: add *.rej
Upstream-commit: 785ba790fbd6082052cec1704fe8e7e09ba89a4d
Component: engine
2015-05-18 11:51:06 -07:00
984dd795a4
Merge pull request #13244 from hqhq/hq_update_vendor_pty
...
kr/pty: vendor upstream 5cf931ef8f
Upstream-commit: 0c375a779ab076c8f6a4f76071e5feab60e15714
Component: engine
2015-05-18 11:46:43 -07:00
7113b757dc
Merge pull request #13277 from runcom/restartpolicy-methods
...
RestartPolicy methods instead of strings checking
Upstream-commit: 3b69ca5b97a937c904b8af91210af86de58f6893
Component: engine
2015-05-18 14:36:54 -04:00
edeb4ed190
Merge pull request #13249 from coolljt0725/fix_incorrect_document_of_storage_opt
...
Fix incorrect document storage-opt
Upstream-commit: 70e9e4bf9f7901137483fb4c9635d8d3cf686328
Component: engine
2015-05-18 11:35:01 -07:00
7232d6b354
Remove use of 'bash' from our tests
...
Not 100% sure why our Windows test don't complain about some of these,
I'm guessing it because we have bash as part of some git package, but
either way we really shouldn't require bash to run our tests unless we
really need to - which in these cases we don't
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 3b1f73fbcd2ed938c499893f318467f14b63085a
Component: engine
2015-05-18 11:29:08 -07:00
4ec571c859
Merge pull request #13295 from aimxhaisse/13294-mflag-panic
...
Fix panic when using default-initialized FlagSet
Upstream-commit: fc4f3e5650493faed1e89bcf9a2a1a61c13dcd34
Component: engine
2015-05-18 11:27:12 -07:00
30a0089656
Merge pull request #13206 from draghuram/info_api_doc
...
Bring /info API doc in line with the actual response.
Upstream-commit: 93825056d8de651e5cbfff9122144e892e988144
Component: engine
2015-05-18 20:20:57 +02:00
ed62b6ffc8
Merge pull request #12804 from ankushagarwal/configuring-docker
...
Add CentOS/RHEL configuration to the config article
Upstream-commit: 8f8ee7d5c3277a3d16556ddcbae40e12f36a154a
Component: engine
2015-05-18 14:18:32 -04:00
b1c2bb01ee
Merge pull request #13280 from runcom/test-clean-from-inspect
...
Clean tests from not needed inspect call
Upstream-commit: aca4ae8c90dc4ae87dec720ed58a69bec6dabab6
Component: engine
2015-05-18 11:06:18 -07:00
61e72a4efb
Bring /info API doc in line with the actual response.
...
The fix handles versions 1.18 and 1.19.
Closes #13139 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: 9c0608565c93a31d6885842376e82a19db5a7af4
Component: engine
2015-05-18 13:55:42 -04:00
bcf5956dfc
Pass -log-opts map to logdrivers
...
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com >
Upstream-commit: 8b11592d699df669b529e34658ef2d870c8a75f8
Component: engine
2015-05-18 16:50:14 +00:00
ce99abf239
Merge pull request #13283 from Microsoft/10662-fixbaselinenewdriver
...
Windows: NewDriver() re-baseline parms
Upstream-commit: 19ae59f9109d08452e37bdd6252fe8a053dd2839
Component: engine
2015-05-18 10:56:06 -04:00
34e0bf8384
Fix panic when using default-initialized FlagSet
...
Closes #13294
Signed-off-by: Sebastien Rannou <mxs@sbrk.org >
Upstream-commit: e94bab8278ed5672d75a4c1121ef4a6c3febc5b9
Component: engine
2015-05-18 11:55:38 +02:00
9e12a52ca0
Use inspectField to simplify code
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 74f8a4eca4d504867aaea63a35ef1e491d332f74
Component: engine
2015-05-18 10:06:13 +08:00
