0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
15654 commits 14 branches 412 tags 338 MiB
Commit graph

15654 commits

This branch
This branch
All branches
Author SHA1 Message Date
Alexander Morozov
dec13cef2a Merge pull request #13346 from mrjana/cnm_integ 
Fix network connectivity problem for non-root users
 2015-05-20 12:02:07 -07:00
Jessie Frazelle
76a5fb3e1e Merge pull request #13359 from davidxia/increase-docker-kill-timeout 
Increase upstart kill timeout to 20 seconds
 2015-05-20 11:54:07 -07:00
David Xia
2f9e7a067a 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>
 2015-05-20 14:20:46 -04:00
Alexander Morozov
53a795378d Merge pull request #13324 from duglin/BadRCOnVersion 
Make version check return 400 instead of 404
 2015-05-20 11:13:56 -07:00
Jana Radhakrishnan
afd901e408 Fix network connectivity problem for non-root users 
If a container was started with a non-root user the container
may not be able to resolve DNS names because of too restrictive
permission in the /etc/resolv.conf container file. This problem
is in how this file gets created in libnetwork and ths PR
attempts to fix the issue by vendoring in the libnetwork code
with the fix.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-05-20 17:51:20 +00:00
Brian Goff
c6d9c904af Merge pull request #13356 from LK4D4/test_double_nethost 
Test for two containers in --net=host
 2015-05-20 13:17:16 -04:00
Jessie Frazelle
b0315e4472 Merge pull request #13354 from jacobat/comment-fix 
Fix wording in comment
 2015-05-20 09:44:23 -07:00
Alexander Morozov
7e5902c92d 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>
 2015-05-20 09:35:28 -07:00
Jacob Atzen
007269ba24 Fix wording in comment 
Signed-off-by: Jacob Atzen <jatzen@gmail.com>
 2015-05-20 18:03:46 +02:00
Jessie Frazelle
c696993452 Merge pull request #13347 from fntlnz/13184-remove-delete-container 
Removed deleteContainer calls
 2015-05-20 07:18:41 -07:00
Brian Goff
37e4d40228 Merge pull request #13328 from icecrime/10662-registryfix-carry 
Windows: fix registry filepath and location
 2015-05-20 10:09:46 -04:00
Lorenzo Fontana
086b514f6a Removed deleteContainer calls 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
 2015-05-20 08:38:23 +02:00
Sven Dowideit
a09dfbcaad Merge pull request #13214 from zoechi/master 
add bwu_docker
 2015-05-20 13:43:16 +10:00
Sven Dowideit
a057accb59 Merge pull request #13315 from SvenDowideit/add-kitematic-docs 
Add Kitematic documentation to docs.master.docker.com
 2015-05-20 12:27:33 +10:00
Sven Dowideit
82bd3886d5 Add Kitematic documentation to docs.master.docker.com 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-05-20 01:57:45 +00:00
Jessie Frazelle
d29dc0b608 Merge pull request #13325 from LK4D4/cleanup_mounts 
Fix Put without Get in overlay
 2015-05-20 03:11:58 +02:00
Arnaud Porterie
496bc46c88 Merge pull request #13060 from mrjana/cnm_integ 
Replace existing docker networking code and integrate with libnetwork
 2015-05-19 17:24:18 -07:00
Jana Radhakrishnan
f12f51b8b9 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>
 2015-05-19 22:40:55 +00:00
Jana Radhakrishnan
d18919e304 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>
 2015-05-19 22:40:19 +00:00
Jana Radhakrishnan
272f8cd4bc Vendoring in libnetwork, netns, netlink 
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-05-19 22:40:18 +00:00
David Calavera
322f675123 Merge pull request #13332 from LK4D4/fix_race_in_rand 
Use goroutine-safe version of rand.Source
 2015-05-19 14:20:33 -07:00
Jessie Frazelle
92c869cd12 Merge pull request #12437 from fmzhen/remove-regex-replace 
Removal of the regex to replace ips
 2015-05-19 22:59:17 +02:00
Fred Lifton
4a743c39dd Merge pull request #13119 from psankar/master 
Followup commit to https://github.com/docker/docker/pull/12986
 2015-05-19 13:14:20 -07:00
Alexander Morozov
d8661250e7 Use goroutine-safe version of rand.Source 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-19 12:32:40 -07:00
Doug Davis
7fcf849749 Make version check return 400 instead of 404 
Closes: #13321

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-05-19 11:21:05 -07:00
Arnaud Porterie
81e7d3571b Windows: fix registry filepath and location 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-05-19 10:58:45 -07:00
Arnaud Porterie
0cc5da0635 Merge pull request #12884 from Microsoft/10662-startcontainerrefactor 
Windows: Refactor container
 2015-05-19 10:44:23 -07:00
Arnaud Porterie
a16b2ab274 Merge pull request #13265 from tiborvass/refactor-v1-auth 
registry: Refactor requestfactory to use http.RoundTrippers
 2015-05-19 09:57:34 -07:00
Alexander Morozov
ea4f43c2fa Merge pull request #13258 from unclejack/fix_build_network 
builder/internals: set up network as bridge
 2015-05-19 09:36:03 -07:00
Alexander Morozov
3916561619 Fix Put without Get in overlay 
It is called for example on daemon start after crash

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-05-19 09:32:23 -07:00
moxiegirl
6f4b808f41 Merge pull request #13238 from hqhq/hq_fix_usingdocker_md 
Remove wrong usage in usingdocker.md
 2015-05-19 09:24:31 -07:00
Alexander Morozov
29595fd944 Merge pull request #13311 from WeiZhang555/cleanup 
clean some redundant else clauses
 2015-05-19 07:57:52 -07:00
Qiang Huang
f46cf73295 Remove wrong usage in usingdocker.md 
Fixes: https://github.com/docker/docker/issues/13235

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-05-19 13:07:41 +08:00
Tibor Vass
73823e5e56 Add transport package to support CancelRequest 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-05-18 23:31:42 -04:00
Zhang Wei
d91ae65280 clean some redundant else clauses 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2015-05-19 10:54:04 +08:00
Mingzhen Feng
3ab7ceb5d7 Removal of the regex to replace ips 
Signed-off-by: Mingzhen Feng <fmzhen@zju.edu.cn>
 2015-05-19 10:15:18 +08:00
Tibor Vass
cf8c0d0f56 requestdecorator: repurpose the package and rename to useragent 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2015-05-18 21:51:54 -04:00
Tibor Vass
a01cc3ca77 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>
 2015-05-18 21:51:53 -04:00
Doug Davis
472538bee0 Merge pull request #13219 from brahmaroutu/gccgo_compile_issue 
fix to gccgo compilation error
 2015-05-18 20:43:47 -04:00
moxiegirl
6a18412d5b Merge pull request #13189 from alvinr/mongodb-fixup 
Fixup MongoDB changes to line up with MongoDB 3.0 release
 2015-05-18 15:22:41 -07:00
Doug Davis
dfc329d76a Merge pull request #13308 from lightsofapollo/issue-13307 
Increase default connection timeout to 30s
 2015-05-18 18:01:00 -04:00
James Lal
f5e6f50a1e Increase default connection timeout to 30s 
Closes #13307
Signed-off-by: James Lal <jlal@mozilla.com>
 2015-05-18 13:26:33 -07:00
Alvin Richards
3f37afe0b9 Bring MongoDB examples up to date with 3.0 release 
Signed-off-by: Alvin Richards <alvin.richards@docker.com>
 2015-05-18 13:08:31 -07:00
Michael Crosby
aac645ae04 Merge pull request #13282 from duglin/RemoveBash 
Remove use of 'bash' from our tests
 2015-05-18 13:06:21 -07:00
Brian Goff
ccf02a9f77 Merge pull request #13279 from hqhq/hq_use_inspectfield 
Use inspectField to simplify code
 2015-05-18 14:53:37 -04:00
Michael Crosby
785ba790fb Merge pull request #13204 from chenhanxiao/gitignore 
gitignore: add *.rej
 2015-05-18 11:51:06 -07:00
Tianon Gravi
0c375a779a Merge pull request #13244 from hqhq/hq_update_vendor_pty 
kr/pty: vendor upstream 5cf931ef8f
 2015-05-18 11:46:43 -07:00
Brian Goff
3b69ca5b97 Merge pull request #13277 from runcom/restartpolicy-methods 
RestartPolicy methods instead of strings checking
 2015-05-18 14:36:54 -04:00
Michael Crosby
70e9e4bf9f Merge pull request #13249 from coolljt0725/fix_incorrect_document_of_storage_opt 
Fix incorrect document storage-opt
 2015-05-18 11:35:01 -07:00
Doug Davis
3b1f73fbcd 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>
 2015-05-18 11:29:08 -07:00