2b0b0c4b97
Remove distribution source code from /go/src
...
We already vendor distribution under ./vendor, but
because the GOPATH is /go:/go/src/github.com/.../vendor
Go will always compile the source code at /go not in ./vendor.
Apart from the fact that it is very inconvenient during
development, it was also a time-bomb: someone vendors a fix
from upstream distribution, but forgets to update
REGISTRY_COMMIT in the Dockerfile, and the binary doesn't get
the fix.
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-05-22 16:50:56 -04:00
f2c0b54315
Merge pull request #13408 from jfrazelle/13407-fix-experimental-build
...
lol 108 chars ETOOMANY
2015-05-22 10:42:57 -07:00
ed9ad0be6d
Merge pull request #13391 from jfrazelle/add-security-maintainers
...
Add diogo and nathan as security maintainers.
2015-05-22 10:12:04 -07:00
a1ea562b20
lol 108 chars ETOOMANY
...
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-22 10:10:17 -07:00
d71ba0cc83
Merge pull request #13372 from calavera/move_socket_creation_to_package
...
Extract sockets initialization to a package.
2015-05-22 08:46:31 -07:00
8e76c0d1d8
Merge pull request #13303 from moxiegirl/experimental-work
...
Experimental features placeholder
2015-05-22 08:42:57 -07:00
0775456b46
Merge pull request #13401 from WeiZhang555/cleanup
...
Delete "defer deleteAllContainers()" from integration-cli
2015-05-22 09:17:23 -04:00
6809fa6861
Delete "defer deleteAllContainers()" from integration-cli
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
2015-05-22 17:01:52 +08:00
23e8dff9e7
Merge pull request #13399 from hqhq/hq_fix_run_test
...
Fix test failure when --net none build
2015-05-21 21:50:44 -04:00
88275e94d6
Merge pull request #12766 from Microsoft/10662-graphdriverrefactor
...
Windows: graphdriver refactor
2015-05-21 21:28:24 -04:00
7c6cab6345
Add diogo and nathan as security maintainers.
...
Updated my email.
Also retabbed the whole file... I am OCD.
Signed-off-by: Jessica Frazelle <princess@docker.com >
2015-05-21 17:59:38 -07:00
2b8271399e
Merge pull request #13386 from icecrime/experimental_suffix_version
...
Suffix experimental version / fix warning output
2015-05-21 17:42:23 -07:00
c0dd8538db
Fix test failure when --net none build
...
Closes : #13369
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
2015-05-22 08:21:09 +08:00
78578125ce
Add suffix to experimental builds version
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
2015-05-21 16:27:42 -07:00
ddf783ed2f
Merge pull request #13395 from SvenDowideit/cs-docker-1.6.2cs5-release-notes
...
Publish release notes for latest cs Docker engine
2015-05-22 09:16:12 +10:00
740b1b5a2d
Publish release notes for latest cs Docker engine
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au >
2015-05-22 09:14:06 +10:00
b639f00280
Merge pull request #13336 from calavera/document_missing_build_flags
...
Document missing build flags.
2015-05-22 01:03:37 +02:00
6c5a140f8a
Merge pull request #13393 from tiborvass/fix-token-bug
...
registry: Fix auth bug
2015-05-21 15:58:17 -07:00
2be757f869
Merge pull request #12964 from Microsoft/10662-emptywindowsexecdriver
...
Windows: Empty Windows Exec Driver
2015-05-21 15:30:21 -07:00
a85b09d8a4
Document missing build flags.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
2015-05-21 15:02:00 -07:00
fc29f7f70b
registry: fix auth bug
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-05-21 16:53:22 -04:00
7fffcfff32
Merge pull request #13387 from cpuguy83/fix_ngroutine_test
...
Better checking for LogsFollowGoroutinesWithStdout
2015-05-21 12:31:57 -07:00
2805ff1ece
Better checking for LogsFollowGoroutinesWithStdout
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-05-21 14:13:01 -04:00
523d2f6a04
Merge pull request #13371 from theadactyl/patch-2
...
Add theadactyl as community manager
2015-05-21 11:06:38 -07:00
00e78a18ba
Merge pull request #13380 from coolljt0725/add_missing_check_return_err_function
...
Add missing return error check for container.WriteHostConfig() in container_linux.go
2015-05-21 09:32:52 -07:00
0ac5e8a170
Merge pull request #13383 from duglin/CreateRMTest
...
Add a 'docker create' + 'docker rm' testcase
2015-05-21 09:32:32 -07:00
012e588a74
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 >
2015-05-21 07:30:51 -07:00
a9bc05a2f8
Add missing return error check
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-21 17:03:43 +08:00
ef0a145593
Merge pull request #13310 from coolljt0725/make_ps_size_show_virtual_size_work
...
Make docker ps --size show virtual size really work
2015-05-20 18:32:11 -07:00
7231692a02
Experimental features placeholder
...
Signed-off-by: Mary Anthony <mary@docker.com >
Adding experimental features into the mix
Signed-off-by: Mary Anthony <mary@docker.com >
renaming file
Signed-off-by: Mary Anthony <mary@docker.com >
2015-05-20 18:10:07 -07:00
d0de2b1e2f
Make docker ps --size show virtual size really work
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
2015-05-21 08:57:11 +08:00
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
Tibor Vass