Phil Estes
97f621bcd8
Merge pull request #11861 from ZJU-SEL/11752-add-cap-list-table
...
Fix-11752 add capabilities list information table.
2015-03-30 23:18:30 -04:00
Harry Zhang
bf15f675b9
Revison the some columns to make table clearer
...
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn>
2015-03-31 02:41:49 +00:00
dalanlan
8d3d34d5e3
fix issue #11676 #11754 , disable RLIMIT_AS,edit DOCKER_OPTS
...
Signed-off-by: Simei He <hesimei@zju.edu.cn>
2015-03-31 10:13:37 +08:00
Doug Davis
73b7cee89c
Merge pull request #11946 from crosbymichael/no-pkg-init
...
Remove port mapper/allocator global state
2015-03-30 22:03:12 -04:00
Michael Crosby
d8c628cf08
Ensure that bridge driver does not use global mappers
...
This has a few hacks in it but it ensures that the bridge driver does
not use global state in the mappers, atleast as much as possible at this
point without further refactoring. Some of the exported fields are
hacks to handle the daemon port mapping but this results in a much
cleaner approach and completely remove the global state from the mapper
and allocator.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-30 18:28:24 -07:00
Darren Shepherd
8f6a14452d
Avoid ServeApi race condition
...
If job "acceptconnections" is called before "serveapi" the API Accept()
method will hang forever waiting for activation. This is due to the fact
that when "acceptconnections" ran the activation channel was nil.
Signed-off-by: Darren Shepherd <darren@rancher.com>
2015-03-30 17:39:43 -07:00
Michael Crosby
62522c9853
Refactor portmapper to remove ALL global state
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-30 17:31:21 -07:00
Michael Crosby
43a50b0618
Refactor port allocator to not have ANY global state
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-30 17:30:59 -07:00
Jessie Frazelle
e7c48f5817
Merge pull request #11942 from crosbymichael/update-libct-mar30
...
Update libcontainer to c8512754166539461fd860451ff
2015-03-30 17:12:53 -07:00
Jessie Frazelle
f0ddbbaa86
Merge pull request #11933 from LK4D4/fix_err_mask
...
Various fixes for execdriver
2015-03-30 17:12:35 -07:00
Michael Crosby
e2d96d4304
Merge pull request #11939 from jfrazelle/fix-go1.3.3
...
fix basicAuth function not in go1.3.3
2015-03-30 16:51:42 -07:00
Jessie Frazelle
1ce39e234c
Merge pull request #11904 from albers/completion-filters
...
Add missing filters to bash completion for docker images and docker ps
2015-03-30 16:37:01 -07:00
Michael Crosby
17ecbcf8ff
Update libcontainer to c8512754166539461fd860451ff
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-30 16:29:10 -07:00
Alexander Morozov
2742bf5cbc
Merge pull request #11938 from achanda/patch-1
...
Remove unused daemon.LogToDisk function
2015-03-30 15:48:03 -07:00
Alexander Morozov
f468bbb7e8
Do not mask *exec.ExitError
...
Fix #11764
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-30 15:31:49 -07:00
Jessica Frazelle
4a2ef6c805
fix basicAuth function not in go1.3.3
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <princess@docker.com> (github: jfrazelle)
2015-03-30 15:28:34 -07:00
Michael Crosby
69b84c5be9
Merge pull request #11936 from runcom/11935-remove-duplicate-assignment
...
Remove duplicate assignment
2015-03-30 15:16:11 -07:00
Abhishek Chanda
1d23bae785
Remove unused daemon.LogToDisk function
...
Fixes #11937
Signed-off-by: Abhishek Chanda <abhishek.becs@gmail.com>
2015-03-30 14:54:17 -07:00
Antonio Murdaca
cc46ae8eae
Remove duplicate assignment
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-30 23:07:43 +02:00
Michael Crosby
fe9f3227b1
Merge pull request #11859 from HuKeping/eof
...
Add nice error message
2015-03-30 13:53:09 -07:00
Michael Crosby
00a15227f8
Merge pull request #11893 from runcom/11892-refactor-utils-flags
...
Refactor utils/flags.go
2015-03-30 13:35:40 -07:00
Alexander Morozov
5a1e5cf8c9
Get child processes before main process die
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-30 13:28:34 -07:00
Alexander Morozov
489ab77f4a
Use proper wait function for --pid=host
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-30 13:27:38 -07:00
Michael Crosby
b6d6ffa1dd
Merge pull request #11896 from vdemeester/9998-cp
...
Docker cp handles resolv.conf, hostname & hosts, fixes #9998
2015-03-30 13:15:00 -07:00
Michael Crosby
70a479dda5
Merge pull request #11900 from runcom/11899-refactor-utils-http
...
Refactor utils/http.go
2015-03-30 13:11:45 -07:00
Michael Crosby
a7a93fd2b2
Merge pull request #11931 from scarletmeow/11563_log_timestamp
...
Upgrade logrus to v0.7.2
2015-03-30 13:09:17 -07:00
Michael Crosby
72dfd6728f
Merge pull request #11869 from dmcgowan/v2-push-gzipped
...
Compress layers on push to a v2 registry
2015-03-30 12:58:55 -07:00
Tiffany Low
711e580320
Upgrade logrus to v0.7.2
...
- Daemon logs now report to millisecond resolution
Signed-off-by: Tiffany Low <the.second.angel@gmail.com>
2015-03-30 12:27:03 -07:00
Derek McGowan
851c64725d
Compress layers on push to a v2 registry
...
When buffering to file add support for compressing the tar contents. Since digest should be computed while writing buffer, include digest creation during buffer.
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2015-03-30 12:15:15 -07:00
Jessie Frazelle
f3a048516e
Merge pull request #11901 from albers/dockerfile-bash-completion
...
Enable bash completion in build environment
2015-03-30 11:52:43 -07:00
Michael Crosby
446437d1a1
Merge pull request #11928 from crosbymichael/aufs-build-errors
...
Fix AUFS logrus build errors on import
2015-03-30 11:49:14 -07:00
Michael Crosby
d1306e63e4
Fix AUFS logrus build errors on import
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-03-30 11:46:44 -07:00
Tianon Gravi
a0d90f18d5
Merge pull request #11890 from albers/completion-run-cgroup-parent
...
Do not complete --cgroup-parent as _filedir
2015-03-30 12:42:30 -06:00
Michael Crosby
14fed352cb
Merge pull request #11799 from dqminh/aufs-dirperm1
...
aufs: apply dirperm1 by default if supported
2015-03-30 11:36:02 -07:00
moxiegirl
3a706d6580
Merge pull request #11894 from ankushagarwal/11630
...
Explain --net=host option usage
2015-03-30 11:18:01 -07:00
Ankush Agarwal
ddd27616e0
Explain --net=host option usage
...
Fixes #11630
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
2015-03-30 10:28:44 -07:00
Alexander Morozov
924d503cb1
Merge pull request #11898 from unclejack/broadcastwriter_writestring
...
pkg/broadcastwriter: avoid alloc w/ WriteString
2015-03-30 09:28:08 -07:00
Antonio Murdaca
0995ab5946
Refactor utils/http.go, fixes #11899
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
2015-03-30 17:59:57 +02:00
Alexander Morozov
a2ea4a9d9d
Merge pull request #11906 from runcom/11905-refactor-utils-tmpdir
...
Refactor utils/tmpdir.go
2015-03-30 08:58:51 -07:00
Alexander Morozov
a27057d779
Merge pull request #11888 from jamiehannaford/commit-cmd-struct
...
Use ContainerCommitResponse struct for Commit cmd
2015-03-30 08:20:32 -07:00
Doug Davis
5ab98eae3c
Merge pull request #11913 from sunyuan3/docker_cli_restart_test
...
Verify MaximumRetryCount=0 if the restart policy is always.
2015-03-30 10:05:08 -04:00
Doug Davis
d95fae062b
Merge pull request #11912 from sunyuan3/typo
...
Fix a typo in daemon/networkdriver/ipallocator/allocator.go
2015-03-29 21:59:50 -04:00
Yuan Sun
f5310f403d
Verify MaximumRetryCount=0 if the restart policy is always.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-03-30 09:08:33 +08:00
Yuan Sun
08331294bc
Fix a typo in daemon/networkdriver/ipallocator/allocator.go
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-03-30 08:31:46 +08:00
moxiegirl
41e47bbf34
Merge pull request #11678 from botchagalupe/docker-11465
...
Closes #11465 - Add additional doc for local registries on pull command
2015-03-29 14:10:20 -07:00
moxiegirl
4edf8e1e53
Merge pull request #11798 from amylindburg/11792-fix-typo
...
Fixing typo in cd instruction
2015-03-29 14:01:35 -07:00
moxiegirl
3bf9869234
Merge pull request #11897 from ankushagarwal/glossary
...
Add Glossary to documentation
2015-03-29 13:49:22 -07:00
moxiegirl
8b3d8f21a0
Merge pull request #11885 from bobrik/fix-formatting
...
Fixed code formatting on docs.docker.com
2015-03-29 13:21:26 -07:00
moxiegirl
3ff71c24c1
Merge pull request #11875 from ahmetalpbalkan/docs/boot2docker-windows
...
Update Documentation for Windows Installation
2015-03-29 13:18:00 -07:00
Vincent Demeester
8bc330d863
Docker cp handles resolv.conf, hostname & hosts, fixes #9998
...
Add a integration test TestCpSpecialFiles
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-03-29 22:10:14 +02:00