d60fe719f4
Merge pull request #13336 from calavera/document_missing_build_flags
...
Document missing build flags.
Upstream-commit: b639f00280d974f4c8c3e1ced18afd5173a1f4e3
Component: engine
2015-05-22 01:03:37 +02:00
21792a8e30
Merge pull request #13393 from tiborvass/fix-token-bug
...
registry: Fix auth bug
Upstream-commit: 6c5a140f8a4470c45f3a9302c00c398b75c23549
Component: engine
2015-05-21 15:58:17 -07:00
a0524deeed
Merge pull request #12964 from Microsoft/10662-emptywindowsexecdriver
...
Windows: Empty Windows Exec Driver
Upstream-commit: 2be757f8696a2df6b02b153db15ea4f6d756c02a
Component: engine
2015-05-21 15:30:21 -07:00
50f6b1411a
Document missing build flags.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: a85b09d8a40456fb5f3b72b7b1999cd9df08c082
Component: engine
2015-05-21 15:02:00 -07:00
ebafe2bed3
registry: fix auth bug
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: fc29f7f70b34ae11e1084a66cf401ff11b4573e7
Component: engine
2015-05-21 16:53:22 -04:00
522037006a
Merge pull request #13387 from cpuguy83/fix_ngroutine_test
...
Better checking for LogsFollowGoroutinesWithStdout
Upstream-commit: 7fffcfff32ce6c4379f3b90a1570847b06d75a8c
Component: engine
2015-05-21 12:31:57 -07:00
97013d9e36
Better checking for LogsFollowGoroutinesWithStdout
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 2805ff1ecee7cd850a08a00ee9448b54beb4032b
Component: engine
2015-05-21 14:13:01 -04:00
8e905a0abb
Merge pull request #13371 from theadactyl/patch-2
...
Add theadactyl as community manager
Upstream-commit: 523d2f6a04d59883d0a45c177209e04729a4daa6
Component: engine
2015-05-21 11:06:38 -07:00
832c917cec
Merge pull request #13380 from coolljt0725/add_missing_check_return_err_function
...
Add missing return error check for container.WriteHostConfig() in container_linux.go
Upstream-commit: 00e78a18ba56970cdb213f41f98fba04c4c7b84b
Component: engine
2015-05-21 09:32:52 -07:00
397e4d3e91
Merge pull request #13383 from duglin/CreateRMTest
...
Add a 'docker create' + 'docker rm' testcase
Upstream-commit: 0ac5e8a1709b09f311f9032c7e139b66ce0bccb5
Component: engine
2015-05-21 09:32:32 -07:00
aa89cbdb44
Add a 'docker create' + 'docker rm' testcase
...
Per @thaJeztah's comment here: https://github.com/docker/docker/pull/13367#issuecomment-104286651
I couldn't find an existing test that covered this.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 012e588a744ce3000d58a7562a1a8291a7fe10ae
Component: engine
2015-05-21 07:30:51 -07:00
aee8d65658
Add missing return error check
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: a9bc05a2f8e0978f47473b07b43d79692cf498bc
Component: engine
2015-05-21 17:03:43 +08:00
a90378a2ea
Merge pull request #13310 from coolljt0725/make_ps_size_show_virtual_size_work
...
Make docker ps --size show virtual size really work
Upstream-commit: ef0a14559332f443a0f111dd22a43b13de3aa967
Component: engine
2015-05-20 18:32:11 -07:00
986a53d09e
Make docker ps --size show virtual size really work
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: d0de2b1e2f0939b25c83183f450c71b8309d1d32
Component: engine
2015-05-21 08:57:11 +08:00
3ad2c8df4b
Merge pull request #13326 from tianon/squeeze-lts
...
Fix "squeeze" detection in contrib/mkimage/debootstrap
Upstream-commit: 366fe46c6a6e604329711a9edbe21f0c6fe31fc9
Component: engine
2015-05-20 17:41:27 -07:00
6ccd65f901
Merge pull request #13195 from albers/completion-custom-host
...
respect -H in bash completion
Upstream-commit: f74d9b8672df985e18f5a1d0b54c6d38618e9b11
Component: engine
2015-05-20 17:31:16 -07:00
f1ceb1ec3a
Merge pull request #13270 from samsabed/gpg-dockerfile
...
Trivial use port 80 for dev Dockerfile gpg
Upstream-commit: c68915ff7072a03b59deb4cf0f4af20d0bb382be
Component: engine
2015-05-20 17:30:01 -07:00
1c051ef581
Merge pull request #13241 from hqhq/hq_enhance_checkconfig
...
Enhance check-config.sh
Upstream-commit: 28465588d07fe9c37573dec52939d44b115db6ee
Component: engine
2015-05-20 17:25:30 -07:00
60c6ee21a9
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 >
Upstream-commit: f86d39c6b6f4945afd80dbfcdd0c623b9c71cfb8
Component: engine
2015-05-20 16:21:36 -07:00
7e35f8d0a4
Merge pull request #13366 from moxiegirl/162-release-notes
...
Updating with 1.6.2-cs5 notes
Upstream-commit: 2bf409d4eff3836dd4cc82bc8cb656af2a2dd63d
Component: engine
2015-05-20 15:03:27 -07:00
4a24c72f56
Updating with 1.6.2-cs5 notes
...
Signed-off-by: Mary Anthony <mary@docker.com >
Upstream-commit: 7554949da654fb55dd1bccc3308ef12c013a16d5
Component: engine
2015-05-20 14:39:00 -07:00
850c8c5ac2
Merge pull request #13263 from rajdeepd/dry-run-test-2
...
TestCase for CpuShares and Cpuset
Upstream-commit: 0fddb6ad7e2505a8c1a2c8273ddc97573256e372
Component: engine
2015-05-20 23:33:42 +02:00
0a8a3b1dc5
Merge pull request #13338 from icecrime/13023_experimental_env_var
...
Add DOCKER_EXPERIMENTAL environment variable
Upstream-commit: 19790c46dc7fbd489bbd4ccd6f138663312e7579
Component: engine
2015-05-20 13:04:28 -07:00
90e040bb15
Merge pull request #13078 from Microsoft/10662-pkgarchive
...
Windows: Archive package changes for Windows daemon
Upstream-commit: 79532e6d5897516b955fd258060fc34a6dfa86f9
Component: engine
2015-05-20 12:39:26 -07:00
045dd55a7d
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 >
Upstream-commit: ca6722f1c5e4e2017a71e33579d91ac0d9ea2a25
Component: engine
2015-05-20 12:21:17 -07:00
673769117b
Merge pull request #13346 from mrjana/cnm_integ
...
Fix network connectivity problem for non-root users
Upstream-commit: dec13cef2a6600f01158668a9a31ba0d976b5f5f
Component: engine
2015-05-20 12:02:07 -07:00
a4089aa4e2
Merge pull request #13359 from davidxia/increase-docker-kill-timeout
...
Increase upstart kill timeout to 20 seconds
Upstream-commit: 76a5fb3e1e329bf38ee6aca29bbe6f3b1b8188c6
Component: engine
2015-05-20 11:54:07 -07:00
56af424158
TestCase for CpuShares and Cpuset
...
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com >
Upstream-commit: ebe344d34b9d708b3634c2e17929cae1abb61ae8
Component: engine
2015-05-20 11:32:48 -07:00
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
baf6ea6d24
Merge pull request #13324 from duglin/BadRCOnVersion
...
Make version check return 400 instead of 404
Upstream-commit: 53a795378ddb092fc6da8c05ff442f5ed52b7bdb
Component: engine
2015-05-20 11:13:56 -07:00
6fda96cea6
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 >
Upstream-commit: afd901e408d8d4ed00707c545ae985bc637a1979
Component: engine
2015-05-20 17:51:20 +00: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
0b8fdcc9ca
Merge pull request #13354 from jacobat/comment-fix
...
Fix wording in comment
Upstream-commit: b0315e44720fbc27a05aaf406430782eaf1c3eaf
Component: engine
2015-05-20 09:44:23 -07: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
729f4ab3fd
Windows: Archive package changes for Windows daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8228ee4b0fe05b856ca84ef8ea84ba29484d9b9c
Component: engine
2015-05-20 08:55:54 -07:00
f301559fd5
Windows: Empty Windows Exec Driver
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8db09ff6290fb2d4aea121c2850940b9bc480ce9
Component: engine
2015-05-20 08:54:04 -07: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
0dbf9760eb
Merge pull request #13060 from mrjana/cnm_integ
...
Replace existing docker networking code and integrate with libnetwork
Upstream-commit: 496bc46c8819a3c8af391ed57d11c43093df0fc1
Component: engine
2015-05-19 17:24:18 -07: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
