a17bdc8390
pkg/jsonlog: add JSONLogBytes for low allocations
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: b535ed3595036931e8e6f4e9da7cd2beb67cb19e
Component: engine
2015-04-01 01:02:18 +03:00
25208704c6
pkg/broadcastwriter: add test w/ "" stream only
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: f26f405b00a2d9d1c6ebc11bffb810c54ac510ce
Component: engine
2015-04-01 01:02:18 +03:00
a5206cf154
Merge pull request #11952 from ankushagarwal/#11581
...
Add some documentation to pkg/system
Upstream-commit: 7dd79dcc7b0c1e0a577de0e232fd936086e9a2cd
Component: engine
2015-03-31 14:58:32 -07:00
f06c130d5c
Merge pull request #11962 from vbatts/vbatts-promote_overlay
...
graphdriver: promote overlay above vfs
Upstream-commit: ded5c73debbf867e17ea611407b76ce2bf043651
Component: engine
2015-03-31 14:39:08 -07:00
dda21393df
Merge pull request #11963 from crosbymichael/api-server
...
API Server Socket Refactoring
Upstream-commit: e4545ed8cb592d692563d1bb026d6feea07f2437
Component: engine
2015-03-31 14:25:32 -07:00
3a4dbacc2f
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 >
Upstream-commit: 2c72ff1dbfa83aa8f797bdfebaacb8a919677326
Component: engine
2015-03-31 17:18:49 -04:00
9ec5ab1d3d
Merge pull request #11961 from dmcgowan/fix-build-progress-output-11849
...
Fix progress reader output on close
Upstream-commit: da6248751b4e5300fe02e0b02bd4a664ba348044
Component: engine
2015-03-31 14:04:33 -07:00
1541e9c937
Merge pull request #11934 from cpuguy83/fix_volume_symlink_check
...
Fix volume symlink check
Upstream-commit: 749a117267c4c0f74b0162af9ed42c3307737dde
Component: engine
2015-03-31 13:56:23 -07:00
358cb6ec63
Refactor API socket handling
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 62806cc85e7faee56acc454b67b8f36786472759
Component: engine
2015-03-31 13:37:49 -07:00
9b832a806e
Merge pull request #11958 from LK4D4/fix_portmapper_race
...
Move portmapper initialization to var block
Upstream-commit: b85cf5da5e27014ff2e5499d91168678c5c99caa
Component: engine
2015-03-31 13:23:45 -07:00
d0e4d6404c
Merge pull request #11473 from pradeepchhetri/docker-wait-cli-integration-test
...
Added basic integration tests for docker wait command
Upstream-commit: a381a1bb0385c9f499025f632413bf6a9abc3f43
Component: engine
2015-03-31 13:23:23 -07:00
3b5106362e
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)
Upstream-commit: aa3083f577224ad74384f648b17c1474ab47b44f
Component: engine
2015-03-31 13:17:25 -07:00
4eb0bea0b6
Merge pull request #11137 from rhvgoyal/fix-removal
...
Do not remove container if underlying resource cleanup failed
Upstream-commit: b875e126dd574039efb3c5a35b160fb940054253
Component: engine
2015-03-31 13:09:23 -07:00
419d6ae6f9
Use getResourcePath instead
...
Also cleans up tests to not shell out for file creation.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 63708dca8a633d68f9342eebd4f7a616e8c48234
Component: engine
2015-03-31 15:10:30 -04:00
4d65e8c72c
Add some documentation to pkg/system
...
Partially addresses #11581
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: e94a48ffc8fa287c4b1b441c5308999693c58b75
Component: engine
2015-03-31 12:00:33 -07:00
c31a2f1ade
Move Profiler into specific http.Handler
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 7609d5279743b47450cc1273ee75504bb6abf8b6
Component: engine
2015-03-31 11:38:17 -07:00
7f060d0ed1
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 >
Upstream-commit: 584180fce7ad11516a256b8abd4621138337e918
Component: engine
2015-03-31 11:30:57 -07:00
471b420e47
Merge pull request #11843 from ahmetalpbalkan/win-cli/monitorttysize
...
windows: monitorTtySize correctly by polling
Upstream-commit: ddbc68f564156818b068c6b1b8b3ce61edfaad43
Component: engine
2015-03-31 11:14:04 -04:00
d03e2c1251
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 >
Upstream-commit: 40945fc186067e5b7edd1f6cd7645ff2ae7cea6c
Component: engine
2015-03-31 09:51:19 -04:00
bc620e0b67
Merge pull request #11861 from ZJU-SEL/11752-add-cap-list-table
...
Fix-11752 add capabilities list information table.
Upstream-commit: 97f621bcd84af39a92b5450a9450941651749944
Component: engine
2015-03-30 23:18:30 -04:00
b39200ad98
Revison the some columns to make table clearer
...
Signed-off-by: Harry Zhang <harryzhang@zju.edu.cn >
Upstream-commit: bf15f675b9042db661de720900f367eff19737c0
Component: engine
2015-03-31 02:41:49 +00:00
cbf8975ab2
Merge pull request #11946 from crosbymichael/no-pkg-init
...
Remove port mapper/allocator global state
Upstream-commit: 73b7cee89c8cde951012c0b0004c5faa579a0028
Component: engine
2015-03-30 22:03:12 -04:00
45221d6bfb
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 >
Upstream-commit: d8c628cf082a50c0a2a5e381a21da8279a5462b4
Component: engine
2015-03-30 18:28:24 -07:00
cbb7d427c6
Refactor portmapper to remove ALL global state
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 62522c98539e1591017cf0d4f28e6a58f3b1ec6b
Component: engine
2015-03-30 17:31:21 -07:00
163fcc5bfd
Refactor port allocator to not have ANY global state
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 43a50b06187e324e43b26003cace0f351a5fb78c
Component: engine
2015-03-30 17:30:59 -07:00
b0216c50d1
Merge pull request #11942 from crosbymichael/update-libct-mar30
...
Update libcontainer to c8512754166539461fd860451ff
Upstream-commit: e7c48f581733a67c25569c38e0c6f2cf3a023d10
Component: engine
2015-03-30 17:12:53 -07:00
154ea9dfc7
Merge pull request #11933 from LK4D4/fix_err_mask
...
Various fixes for execdriver
Upstream-commit: f0ddbbaa8615b4afd89dc4e37f585bd041da7ba2
Component: engine
2015-03-30 17:12:35 -07:00
ab2da9516a
Merge pull request #11939 from jfrazelle/fix-go1.3.3
...
fix basicAuth function not in go1.3.3
Upstream-commit: e2d96d43040cb183fcf897cae48b40193e6d03d8
Component: engine
2015-03-30 16:51:42 -07:00
208b0b8235
Merge pull request #11904 from albers/completion-filters
...
Add missing filters to bash completion for docker images and docker ps
Upstream-commit: 1ce39e234c815dc7416d644a02c166725fa1d8f6
Component: engine
2015-03-30 16:37:01 -07:00
477d0f5d83
Update libcontainer to c8512754166539461fd860451ff
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 17ecbcf8ff051575928a6e9fb13be0b034b3090d
Component: engine
2015-03-30 16:29:10 -07:00
595da7af33
Merge pull request #11938 from achanda/patch-1
...
Remove unused daemon.LogToDisk function
Upstream-commit: 2742bf5cbc2d7b8141f527f1e9e1014fdce328b2
Component: engine
2015-03-30 15:48:03 -07:00
9ce95596ab
Do not mask *exec.ExitError
...
Fix #11764
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f468bbb7e8c89204bd5d8f346ecec4606b9f3b31
Component: engine
2015-03-30 15:31:49 -07:00
127f29ac8e
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)
Upstream-commit: 4a2ef6c8053d5b0eb768297af8609505198c7187
Component: engine
2015-03-30 15:28:34 -07:00
fa379f41d2
Merge pull request #11936 from runcom/11935-remove-duplicate-assignment
...
Remove duplicate assignment
Upstream-commit: 69b84c5be9f7ef00166a50800786058092d58cbc
Component: engine
2015-03-30 15:16:11 -07:00
fe4221a719
Remove unused daemon.LogToDisk function
...
Fixes #11937
Signed-off-by: Abhishek Chanda <abhishek.becs@gmail.com >
Upstream-commit: 1d23bae785ce8c94227def97b673307e1743db88
Component: engine
2015-03-30 14:54:17 -07:00
f91badaa49
Remove duplicate assignment
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: cc46ae8eaef2ce441e5f35412c4ee6ccbb65c2de
Component: engine
2015-03-30 23:07:43 +02:00
dfa22e2d7b
Merge pull request #11859 from HuKeping/eof
...
Add nice error message
Upstream-commit: fe9f3227b18504add673b9c62669032c3f17e726
Component: engine
2015-03-30 13:53:09 -07:00
f6752519af
Merge pull request #11893 from runcom/11892-refactor-utils-flags
...
Refactor utils/flags.go
Upstream-commit: 00a15227f8c7679a4a5c1f90e61367a3d1be92df
Component: engine
2015-03-30 13:35:40 -07:00
c6b7d50add
Get child processes before main process die
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 5a1e5cf8c9bff51f6314754c039bf7511e2fb613
Component: engine
2015-03-30 13:28:34 -07:00
6af6b1f997
Use proper wait function for --pid=host
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 489ab77f4aea9bc3e7ada751cab5d827040b1e8b
Component: engine
2015-03-30 13:27:38 -07:00
0fa6cf44f7
Merge pull request #11896 from vdemeester/9998-cp
...
Docker cp handles resolv.conf, hostname & hosts, fixes #9998
Upstream-commit: b6d6ffa1dd7172ba6e5f2eb8adf1626a6ee47a01
Component: engine
2015-03-30 13:15:00 -07:00
f3f4c403c1
Merge pull request #11900 from runcom/11899-refactor-utils-http
...
Refactor utils/http.go
Upstream-commit: 70a479dda5e2f99ac141853c2a8527a026c1da6f
Component: engine
2015-03-30 13:11:45 -07:00
bf3cebd134
Merge pull request #11931 from scarletmeow/11563_log_timestamp
...
Upgrade logrus to v0.7.2
Upstream-commit: a7a93fd2b22d70e063e0ec12dc0e5365238bc682
Component: engine
2015-03-30 13:09:17 -07:00
7fd0208ff7
Upgrade logrus to v0.7.2
...
- Daemon logs now report to millisecond resolution
Signed-off-by: Tiffany Low <the.second.angel@gmail.com >
Upstream-commit: 711e580320a5da5cb33e8f03a17d355b4fb127c1
Component: engine
2015-03-30 12:27:03 -07:00
fce72f0ec0
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)
Upstream-commit: 851c64725d0b1b37e51fa0d0df744bbe82ad4c7b
Component: engine
2015-03-30 12:15:15 -07:00
488df4812a
Merge pull request #11901 from albers/dockerfile-bash-completion
...
Enable bash completion in build environment
Upstream-commit: f3a048516eaef7c8438446dc2e045bf4b306c8b0
Component: engine
2015-03-30 11:52:43 -07:00
e54d4e4dac
Fix AUFS logrus build errors on import
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: d1306e63e478cf8fb7ee093c828763e27a5b0cc9
Component: engine
2015-03-30 11:46:44 -07:00
f45f722875
Merge pull request #11890 from albers/completion-run-cgroup-parent
...
Do not complete --cgroup-parent as _filedir
Upstream-commit: a0d90f18d5aac73c76c64c7d25a82b5b8d3eb3e2
Component: engine
2015-03-30 12:42:30 -06:00
d7e9f5fdd9
Merge pull request #11799 from dqminh/aufs-dirperm1
...
aufs: apply dirperm1 by default if supported
Upstream-commit: 14fed352cbb29232af1644e49e019da897a44de6
Component: engine
2015-03-30 11:36:02 -07:00
5ba38993bc
Explain --net=host option usage
...
Fixes #11630
Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com >
Upstream-commit: ddd27616e0abe44c7589b15de3fdbf5bb043ea6a
Component: engine
2015-03-30 10:28:44 -07:00
