Derek McGowan
62009ef77e
Use vendored v2 registry api
...
Update registry package to use the v2 registry api from distribution. Update interfaces to directly take in digests.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-03-31 15:02:27 -07:00
Derek McGowan
f011d722ce
Vendor distribution v2 api
...
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-03-31 14:58:45 -07:00
Michael Crosby
ded5c73deb
Merge pull request #11962 from vbatts/vbatts-promote_overlay
...
graphdriver: promote overlay above vfs
2015-03-31 14:39:08 -07:00
Alexander Morozov
e4545ed8cb
Merge pull request #11963 from crosbymichael/api-server
...
API Server Socket Refactoring
2015-03-31 14:25:32 -07:00
Vincent Batts
2c72ff1dbf
graphdriver: promote overlay above vfs
...
It's about time to let folks not hit 'vfs', when 'overlay' is supported
on their kernel. Especially now that v3.18.y is a long-term kernel.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
2015-03-31 17:18:49 -04:00
Michael Crosby
da6248751b
Merge pull request #11961 from dmcgowan/fix-build-progress-output-11849
...
Fix progress reader output on close
2015-03-31 14:04:33 -07:00
Jessie Frazelle
749a117267
Merge pull request #11934 from cpuguy83/fix_volume_symlink_check
...
Fix volume symlink check
2015-03-31 13:56:23 -07:00
Arnaud Porterie
e04acf8a38
Merge pull request #11045 from brahmaroutu/fixtest_10964
...
Skip TestEventsImagePull unless network is available
2015-03-31 13:48:54 -07:00
Michael Crosby
62806cc85e
Refactor API socket handling
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-31 13:37:49 -07:00
Michael Crosby
b85cf5da5e
Merge pull request #11958 from LK4D4/fix_portmapper_race
...
Move portmapper initialization to var block
2015-03-31 13:23:45 -07:00
Jessie Frazelle
a381a1bb03
Merge pull request #11473 from pradeepchhetri/docker-wait-cli-integration-test
...
Added basic integration tests for docker wait command
2015-03-31 13:23:23 -07:00
Derek McGowan
aa3083f577
Fix progress reader output on close
...
Currently the progress reader won't close properly by not setting the close size.
fixes #11849
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-03-31 13:17:25 -07:00
Jessie Frazelle
b875e126dd
Merge pull request #11137 from rhvgoyal/fix-removal
...
Do not remove container if underlying resource cleanup failed
2015-03-31 13:09:23 -07:00
Brian Goff
63708dca8a
Use getResourcePath instead
...
Also cleans up tests to not shell out for file creation.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2015-03-31 15:10:30 -04:00
Michael Crosby
7609d52797
Move Profiler into specific http.Handler
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
2015-03-31 11:38:17 -07:00
Alexander Morozov
584180fce7
Initialize portMapper in RequestPort too
...
Api requesting port for daemon before init_networkdriver called.
Problem is that now initialization of api depends on initialization of
daemon and their intializations runs in parallel. Proper fix will be
just do it sequentially. For now I don't want refactor it, because it
can bring additional problems in 1.6.0.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
2015-03-31 11:30:57 -07:00
Tibor Vass
ddbc68f564
Merge pull request #11843 from ahmetalpbalkan/win-cli/monitorttysize
...
windows: monitorTtySize correctly by polling
2015-03-31 11:14:04 -04:00
Vivek Goyal
40945fc186
container: Do not remove contianer if any of the resource failed cleanup
...
Do not remove container if any of the resource could not be cleaned up. We
don't want to leak resources.
Two new states have been created. RemovalInProgress and Dead. Once container
is Dead, it can not be started/restarted. Dead container signifies the
container where we tried to remove it but removal failed. User now needs to
figure out what went wrong, corrent the situation and try cleanup again.
RemovalInProgress signifies that container is already being removed. Only
one removal can be in progress.
Also, do not allow start of a container if it is already dead or removal is
in progress.
Also extend existing force option (-f) to docker rm to not return an error
and remove container from user view even if resource cleanup failed.
This will allow a user to get back to old behavior where resources
might leak but atleast user will be able to make progress.
Signed-off-by: Vivek Goyal <vgoyal@redhat.com >
2015-03-31 09:51:19 -04:00
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
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
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