dcde68b955
Merge pull request #19952 from WeiZhang555/fix-err-restarting-1
...
Fix error message for pause a restarting container
2016-02-03 17:34:19 -08:00
e74c07b947
Merge pull request #19980 from tonistiigi/fix-microsoft-vendor-dir
...
Remove case sensitive duplicate dir in vendor
2016-02-03 17:32:14 -08:00
fdcce4ac03
Merge pull request #19942 from LK4D4/fix_vet_errors
...
Fix minor vet warnings
2016-02-03 13:31:11 -08:00
b9a395c85d
Remove case sensitive duplicate dir in vendor
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-02-03 13:06:32 -08:00
3b80b1947c
Merge pull request #19943 from aboch/ec
...
Store endpoint config on network connect to a stopped container
2016-02-03 11:06:35 -08:00
28a7577a02
Merge pull request #19959 from WeiZhang555/fix-cli-print-err
...
Remove redundant error message
2016-02-03 10:56:19 -08:00
7a20a270bc
Fix minor vet warnings
...
Also use Asserts where it's possible.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2016-02-03 10:43:01 -08:00
b2c162a0b3
Merge pull request #19966 from twistlock/user_namespace__unnecessary_text_in_error
...
user namespaces: duplicate dot in user namespaces error message
2016-02-03 12:51:51 -05:00
98c4f0bbc3
Merge pull request #18966 from mariusGundersen/machine-readable-state
...
Expose the machine readable state of a container when listing containers
2016-02-03 16:41:45 +01:00
858f852da4
user namespaces: duplicate dot in user namespaces error message
...
duplicate dot in user namespaces error message:
$ docker run -ti --net=host ubuntu /bin/bash
docker: Error response from daemon: Cannot share the host or a
container's network namespace when user namespaces are enabled..
Signed-off-by: Liron Levin <liron@twistlock.com>
2016-02-03 16:56:34 +02:00
f37e10aee3
Merge pull request #19961 from coolljt0725/check_nil
...
1.10.0-rc3: Check nil before set resource.OomKillDisable
2016-02-03 14:52:18 +01:00
2c63ac3a97
Fix error message for pause a restarting container
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-03 21:20:27 +08:00
b75d0929b1
Merge pull request #19914 from coolljt0725/fix_top_restart
...
Fix docker top a restarting container
2016-02-03 11:28:10 +01:00
09a33b5f60
Check nil before set resource.OomKillDisable
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-02-03 04:31:00 -05:00
894266c1bb
Remove redundant error message
...
Currently some commands including `kill`, `pause`, `restart`, `rm`,
`rmi`, `stop`, `unpause`, `udpate`, `wait` will print a lot of error
message on client side, with a lot of redundant messages, this commit is
trying to remove the unuseful and redundant information for user.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-02-03 15:45:20 +08:00
5566ccb7aa
Fix docker top a restarting container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-02-02 21:05:01 -05:00
55268f4e91
Windows: Turn off stats
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 17:59:11 -08:00
9b63e4e7f5
Store endpoint config on network connect to a stopped container
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-02-02 17:25:44 -08:00
c2bf90eb59
Merge pull request #19935 from Microsoft/jjh/onemorereliabilityhack
...
Windows CI: One more reliability hack
2016-02-02 16:49:29 -08:00
83ee24e52b
Merge pull request #19911 from Microsoft/jstarks/npipe
...
Windows: Add support for named pipe protocol
2016-02-02 15:59:45 -08:00
14c53160d7
Windows CI: One more reliability hack
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 13:15:35 -08:00
b6a6ed7200
Merge pull request #19932 from calavera/fix_config_validation
...
Make sure flat options are not parsed as config structures.
2016-02-02 15:36:25 -05:00
b6766e3063
Make sure flat options are not parsed as config structures.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-02 14:45:37 -05:00
6f0831930f
Windows CI: Re-do TP4 CI reliability hack
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-02 09:36:18 -08:00
4f37e14e9c
Merge pull request #18362 from runcom/tunable-SetMaxThreads
...
daemon_unix: set golang runtime max threads
2016-02-02 08:36:28 -08:00
2b56501480
Merge pull request #19909 from Microsoft/jjh/testunit-daemon
...
Windows CI: Fix test-unit for daemon
2016-02-02 16:18:02 +01:00
42f2621b0e
Windows CI: Fix test-unit for daemon
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-01 20:40:57 -08:00
0906195fbb
Windows: Add support for named pipe protocol
...
This adds an npipe protocol option for Windows hosts, akin to unix
sockets for Linux hosts. This should become the default transport
for Windows, but this change does not yet do that.
It also does not add support for the client side yet since that
code is in engine-api, which will have to be revendored separately.
Signed-off-by: John Starks <jostarks@microsoft.com>
2016-02-01 19:46:30 -08:00
a39ad952ec
Merge pull request #19889 from Microsoft/jjh/reliabilitytake2
...
Windows CI: TP4 reliability hack
2016-02-01 22:30:51 -05:00
2ebcb48cf1
Windows CI: TP4 reliability hack
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2016-02-01 18:02:57 -08:00
5d07d83ee0
remove the unused Info interface in daemon/execdriver/driver.go and related code
...
Signed-off-by: Fangyuan Gao <21551127@zju.edu.cn>
2016-02-02 09:04:52 +08:00
85475f7dea
Merge pull request #19794 from calavera/14358-disable-colors
...
[Carry 18621] Allow disabling of colored Docker logs via daemon flag.
2016-02-01 15:37:44 -08:00
87a450a37f
Allow disabling of colored Docker logs via daemon flag.
...
Signed-off-by: Vincent Woo <me@vincentwoo.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
2016-02-01 16:19:18 -05:00
9c332b164f
Remove package daemonbuilder.
...
Currently, daemonbuilder package (part of daemon) implemented the
builder backend. However, it was a very thin wrapper around daemon
methods and caused an implementation dependency for api/server build
endpoint. api/server buildrouter should only know about the backend
implementing the /build API endpoint.
Removing daemonbuilder involved moving build specific methods to
respective files in the daemon, where they fit naturally.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
2016-02-01 09:57:38 -08:00
feda5d7684
Make btrfs call same interface as others
...
Most storage drivers call graphdriver.GetFSMagic(home),
it is more clean to easy to maintain. So btrfs need to
adopt such change.
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
2016-02-01 07:50:21 +00:00
2ed72a5d93
Expose the machine readable state of a container when listing containers
...
Updated documentation to reflect the new State property in the inspect remote api
Updated API changes for 1.23
Signed-off-by: Marius Gundersen <me@mariusgundersen.net>
2016-01-31 18:40:37 +01:00
140a74347d
daemon_unix: set golang runtime max threads
...
SetMaxThreads from runtime/debug in Golang is called to set max threads
value to 90% of /proc/sys/kernel/threads-max
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-01-30 21:37:24 +01:00
46018c3cee
Merge pull request #19837 from cpuguy83/carry_19085
...
Carry 19085 -- Improve & cleanup documentation comments
2016-01-29 14:30:25 -08:00
9c09a79ba5
update doc string
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-01-29 15:25:25 -05:00
318b4f0b5f
Fix typos in create.go
...
There were a few spelling issues that I noticed when reading about shared mounts.
Signed-off-by: jgeiger <joey.geiger@irco.com>
2016-01-28 14:08:11 -07:00
36b5e63179
Merge pull request #19773 from coolljt0725/fix_message
...
Correct the info message when stop container
2016-01-28 08:29:42 +01:00
7a016578db
Merge pull request #18041 from jnummelin/feature/fluent-logger-ignore-connect-error-flag
...
Added flag to ignore fluentd connect error on container start
2016-01-27 14:25:24 -08:00
f4e5eb3f86
Merge pull request #19775 from coolljt0725/fix_prepare_mount
...
daemon: don't prepare mountpoint for restart container
2016-01-27 16:11:12 -05:00
5a3351883b
Add tag support to journald logging driver, closes #19556
...
Signed-off-by: Ivan Babrou <ibobrik@gmail.com>
2016-01-27 10:52:19 +00:00
6716a3a167
Correct the info message when stop container
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-27 03:06:45 -05:00
0feeab2e43
daemon: don't prepare mountpoint for restart container
...
The restart container has already prepared the mountpoint, there is
no need to do that again. This can speed up the daemon start if
the restart container has a volume and the volume driver is not
available.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2016-01-27 02:43:40 -05:00
3cf82ff1ab
Added flag to ignore fluentd connect error on container start
...
Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com>
Changed buffer size to 1M and removed unnecessary fmt call
Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com>
Updated docs for the new fluentd opts
Signed-off-by: Jussi Nummelin <jussi.nummelin@gmail.com>
2016-01-27 09:05:44 +02:00
63f8429bf0
Merge pull request #19717 from coolljt0725/fix_load
...
Daemon: do GetRWLayer after checking if container support the current graph driver
2016-01-26 21:55:32 -08:00
0ae94303b8
Merge pull request #19722 from WeiZhang555/exec-restarting
...
Forbid exec a restarting container
2016-01-27 11:43:43 +08:00
70c5e96cb8
Merge pull request #19604 from Microsoft/jjh/testrename
...
Windows CI: Fix TestRename*
2016-01-26 19:03:31 -08:00
Jess Frazelle
Tonis Tiigi
Alexander Morozov
Alexander Morozov
Phil Estes
Vincent Demeester
Liron Levin
Sebastiaan van Stijn
Zhang Wei
Lei Jitang
John Howard
Alessandro Boch
Tibor Vass
David Calavera
Arnaud Porterie
John Starks
Brian Goff
Fangyuan Gao
Vincent Woo
Anusha Ragunathan
Kai Qiang Wu(Kennan)
Marius Gundersen
Antonio Murdaca
Joey Geiger
Ivan Babrou
Jussi Nummelin