366fe46c6a
Merge pull request #13326 from tianon/squeeze-lts
...
Fix "squeeze" detection in contrib/mkimage/debootstrap
2015-05-20 17:41:27 -07:00
f74d9b8672
Merge pull request #13195 from albers/completion-custom-host
...
respect -H in bash completion
2015-05-20 17:31:16 -07:00
c68915ff70
Merge pull request #13270 from samsabed/gpg-dockerfile
...
Trivial use port 80 for dev Dockerfile gpg
2015-05-20 17:30:01 -07:00
28465588d0
Merge pull request #13241 from hqhq/hq_enhance_checkconfig
...
Enhance check-config.sh
2015-05-20 17:25:30 -07:00
0bfbc6e788
Extract sockets initialization to a package.
...
Because I just used it somewhere else and it would be nice if I didn't have to copy and paste the code.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-05-20 16:48:39 -07:00
f86d39c6b6
Add theadactyl as community manager
...
Added Community Manager role to Org.Operators and added theadactyl as community manager
Signed-off-by: Thea Lamkin <thea@docker.com>
2015-05-20 16:21:36 -07:00
2bf409d4ef
Merge pull request #13366 from moxiegirl/162-release-notes
...
Updating with 1.6.2-cs5 notes
2015-05-20 15:03:27 -07:00
7554949da6
Updating with 1.6.2-cs5 notes
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-05-20 14:39:00 -07:00
0fddb6ad7e
Merge pull request #13263 from rajdeepd/dry-run-test-2
...
TestCase for CpuShares and Cpuset
2015-05-20 23:33:42 +02:00
19790c46dc
Merge pull request #13338 from icecrime/13023_experimental_env_var
...
Add DOCKER_EXPERIMENTAL environment variable
2015-05-20 13:04:28 -07:00
79532e6d58
Merge pull request #13078 from Microsoft/10662-pkgarchive
...
Windows: Archive package changes for Windows daemon
2015-05-20 12:39:26 -07:00
ca6722f1c5
Add DOCKER_EXPERIMENTAL environment variable
...
The DOCKER_EXPERIMENTAL environment variable drives the activation of
the 'experimental' build tag.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-05-20 12:21:17 -07:00
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
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
ebe344d34b
TestCase for CpuShares and Cpuset
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
2015-05-20 11:32:48 -07:00
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
53a795378d
Merge pull request #13324 from duglin/BadRCOnVersion
...
Make version check return 400 instead of 404
2015-05-20 11:13:56 -07:00
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
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
b0315e4472
Merge pull request #13354 from jacobat/comment-fix
...
Fix wording in comment
2015-05-20 09:44:23 -07:00
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
007269ba24
Fix wording in comment
...
Signed-off-by: Jacob Atzen <jatzen@gmail.com>
2015-05-20 18:03:46 +02:00
8228ee4b0f
Windows: Archive package changes for Windows daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-20 08:55:54 -07:00
8db09ff629
Windows: Empty Windows Exec Driver
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-20 08:54:04 -07:00
4e8b2509fd
Windows: graphdriver refactor
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-05-20 08:51:27 -07:00
c696993452
Merge pull request #13347 from fntlnz/13184-remove-delete-container
...
Removed deleteContainer calls
2015-05-20 07:18:41 -07:00
37e4d40228
Merge pull request #13328 from icecrime/10662-registryfix-carry
...
Windows: fix registry filepath and location
2015-05-20 10:09:46 -04:00
086b514f6a
Removed deleteContainer calls
...
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
2015-05-20 08:38:23 +02:00
a09dfbcaad
Merge pull request #13214 from zoechi/master
...
add bwu_docker
2015-05-20 13:43:16 +10:00
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
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
d29dc0b608
Merge pull request #13325 from LK4D4/cleanup_mounts
...
Fix Put without Get in overlay
2015-05-20 03:11:58 +02:00
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
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
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
272f8cd4bc
Vendoring in libnetwork, netns, netlink
...
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
2015-05-19 22:40:18 +00:00
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
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
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
d8661250e7
Use goroutine-safe version of rand.Source
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-05-19 12:32:40 -07:00
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
81e7d3571b
Windows: fix registry filepath and location
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-05-19 10:58:45 -07:00
0cc5da0635
Merge pull request #12884 from Microsoft/10662-startcontainerrefactor
...
Windows: Refactor container
2015-05-19 10:44:23 -07:00
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
c64466fb68
Fix "squeeze" detection in contrib/mkimage/debootstrap
...
This stops us from erroneously adding "squeeze-lts" to "oldstable" which is now "wheezy", not "squeeze" (but "oldoldstable" _is_ squeeze, hence the new check on `/etc/debian_version` being `6.*` instead, and done as a `case` for the eventual addition of `wheezy-lts`, etc).
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-05-19 09:38:27 -07:00
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
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
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
29595fd944
Merge pull request #13311 from WeiZhang555/cleanup
...
clean some redundant else clauses
2015-05-19 07:57:52 -07:00
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
Jessie Frazelle
Tianon Gravi
David Calavera
theadactyl
moxiegirl
Antonio Murdaca
Arnaud Porterie
Alexander Morozov
Rajdeep Dua
David Xia
Jana Radhakrishnan
Brian Goff
Alexander Morozov
Jacob Atzen
John Howard
Lorenzo Fontana
Sven Dowideit
Sven Dowideit
Fred Lifton
Doug Davis
Qiang Huang