Commit Graph

3021 Commits

Author SHA1 Message Date
3f8eca9ec3 Merge pull request #19943 from aboch/ec
Store endpoint config on network connect to a stopped container
Upstream-commit: 3b80b1947c0f7ac879c4fdf5d6f50e5e3e97d07e
Component: engine
2016-02-03 11:06:35 -08:00
5649ae9668 Merge pull request #19959 from WeiZhang555/fix-cli-print-err
Remove redundant error message
Upstream-commit: 28a7577a029780e4533faf3d057ec9f6c7a10948
Component: engine
2016-02-03 10:56:19 -08:00
553379f1b3 Merge pull request #19966 from twistlock/user_namespace__unnecessary_text_in_error
user namespaces: duplicate dot in user namespaces error message
Upstream-commit: b2c162a0b34ac0c5caaa1f30b1a3a7d6844b83a9
Component: engine
2016-02-03 12:51:51 -05:00
71738b2706 Merge pull request #18966 from mariusGundersen/machine-readable-state
Expose the machine readable state of a container when listing containers
Upstream-commit: 98c4f0bbc3580df2b1dabde513e9aa97362fa3cc
Component: engine
2016-02-03 16:41:45 +01:00
d672770336 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>
Upstream-commit: 858f852da48a7d075cbc5139356a36ac975bf10f
Component: engine
2016-02-03 16:56:34 +02:00
3d7b972d74 Merge pull request #19961 from coolljt0725/check_nil
1.10.0-rc3: Check nil before set resource.OomKillDisable
Upstream-commit: f37e10aee3e23f60bc3d964dd9004c371d8f1371
Component: engine
2016-02-03 14:52:18 +01:00
c0abf32b68 Merge pull request #19914 from coolljt0725/fix_top_restart
Fix docker top a restarting container
Upstream-commit: b75d0929b1df1481a928531102531a38f143ad49
Component: engine
2016-02-03 11:28:10 +01:00
fc2d98659e Check nil before set resource.OomKillDisable
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 09a33b5f60557ee3846baa48f5628bc6b8a70a9b
Component: engine
2016-02-03 04:31:00 -05:00
68f96de053 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>
Upstream-commit: 894266c1bbdfeb53bf278f3cb762945bac69e592
Component: engine
2016-02-03 15:45:20 +08:00
0c9780ee15 Fix docker top a restarting container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5566ccb7aa0747005573f6f4f04f46552b75a394
Component: engine
2016-02-02 21:05:01 -05:00
cf751d8144 Windows: Turn off stats
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 55268f4e9158738631f04e7e4becf39c9043b60a
Component: engine
2016-02-02 17:59:11 -08:00
2b5317f067 Store endpoint config on network connect to a stopped container
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 9b63e4e7f5a02efa89d8bc91e1cb5e4cada60093
Component: engine
2016-02-02 17:25:44 -08:00
d23aa0257d Merge pull request #19935 from Microsoft/jjh/onemorereliabilityhack
Windows CI: One more reliability hack
Upstream-commit: c2bf90eb59d1d9e7565ba381d4c86bd48d9c36d0
Component: engine
2016-02-02 16:49:29 -08:00
43913f9547 Merge pull request #19911 from Microsoft/jstarks/npipe
Windows: Add support for named pipe protocol
Upstream-commit: 83ee24e52b04fd8cf1f7366dff04baa43d89ec49
Component: engine
2016-02-02 15:59:45 -08:00
9dd09cab07 Windows CI: One more reliability hack
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 14c53160d7477813839f6996cf340004ebe335c5
Component: engine
2016-02-02 13:15:35 -08:00
794f697ccd Merge pull request #19932 from calavera/fix_config_validation
Make sure flat options are not parsed as config structures.
Upstream-commit: b6a6ed7200281a2c2d0ca0824e69beb7240e6ddd
Component: engine
2016-02-02 15:36:25 -05:00
bfd1c80469 Make sure flat options are not parsed as config structures.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: b6766e3063dccfc58c0ab1cfc9687cfa2947be6a
Component: engine
2016-02-02 14:45:37 -05:00
681c5de598 Windows CI: Re-do TP4 CI reliability hack
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6f0831930fbccfbb2b7552b64a4b54698b4b861c
Component: engine
2016-02-02 09:36:18 -08:00
4acd5eb7af Merge pull request #18362 from runcom/tunable-SetMaxThreads
daemon_unix: set golang runtime max threads
Upstream-commit: 4f37e14e9c1f57015d4a212bc48601eaef0fc733
Component: engine
2016-02-02 08:36:28 -08:00
7cb0758c9a Merge pull request #19909 from Microsoft/jjh/testunit-daemon
Windows CI: Fix test-unit for daemon
Upstream-commit: 2b565014800d7126a5645f9bc3296f183d0f5257
Component: engine
2016-02-02 16:18:02 +01:00
19be4d0467 Windows CI: Fix test-unit for daemon
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 42f2621b0e19f263902e9f2eb3df0ef6d27d5fa4
Component: engine
2016-02-01 20:40:57 -08:00
27daf9cbce 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>
Upstream-commit: 0906195fbbd6f379c163b80f23e4c5a60bcfc5f0
Component: engine
2016-02-01 19:46:30 -08:00
eb79a73a95 Merge pull request #19889 from Microsoft/jjh/reliabilitytake2
Windows CI: TP4 reliability hack
Upstream-commit: a39ad952ec1efc3b7536d3d8a93e96a22cd1818b
Component: engine
2016-02-01 22:30:51 -05:00
e2603dbc62 Windows CI: TP4 reliability hack
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2ebcb48cf1b4f883260b62f687e2c54926749b68
Component: engine
2016-02-01 18:02:57 -08:00
dce9d7fda4 remove the unused Info interface in daemon/execdriver/driver.go and related code
Signed-off-by: Fangyuan Gao <21551127@zju.edu.cn>
Upstream-commit: 5d07d83ee0802391ff2ed5e10838376a9b817bba
Component: engine
2016-02-02 09:04:52 +08:00
252a3f9cb5 Merge pull request #19794 from calavera/14358-disable-colors
[Carry 18621] Allow disabling of colored Docker logs via daemon flag.
Upstream-commit: 85475f7deabed7d94e98321bdb190f7eb756eaec
Component: engine
2016-02-01 15:37:44 -08:00
fb14e6604b 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>
Upstream-commit: 87a450a37f0e934b67c90fbcdbff28459216e332
Component: engine
2016-02-01 16:19:18 -05:00
fe296e65a0 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>
Upstream-commit: 9c332b164f1aefa2407706adf59d50495d6e02cb
Component: engine
2016-02-01 09:57:38 -08:00
7aca59c08a 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>
Upstream-commit: feda5d768439c6ecb8d3c82cee332724302e7cd2
Component: engine
2016-02-01 07:50:21 +00:00
a680f04e2d 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>
Upstream-commit: 2ed72a5d9368cab3bf9e3dadde95b3d4d50048d1
Component: engine
2016-01-31 18:40:37 +01:00
01cb29485d 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>
Upstream-commit: 140a74347d7fde130598aeca028b72af99737239
Component: engine
2016-01-30 21:37:24 +01:00
76f6e45741 Merge pull request #19837 from cpuguy83/carry_19085
Carry 19085 -- Improve & cleanup documentation comments 
Upstream-commit: 46018c3cee3a6fb76373289306f81ede881c9ca6
Component: engine
2016-01-29 14:30:25 -08:00
b5c499b982 update doc string
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 9c09a79ba54080873b435842fb2a4aaa3b701a9c
Component: engine
2016-01-29 15:25:25 -05:00
025414686c 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>
Upstream-commit: 318b4f0b5f0639149f5e88aba805cdd454d4d9ee
Component: engine
2016-01-28 14:08:11 -07:00
fb0f0495d5 Merge pull request #19773 from coolljt0725/fix_message
Correct the info message when stop container
Upstream-commit: 36b5e6317906d949bf5f823a357f4e30d78e6f98
Component: engine
2016-01-28 08:29:42 +01:00
154bed9787 Merge pull request #18041 from jnummelin/feature/fluent-logger-ignore-connect-error-flag
Added flag to ignore fluentd connect error on container start
Upstream-commit: 7a016578dbb5c9b8a43b43e1ce96785fa26baf56
Component: engine
2016-01-27 14:25:24 -08:00
7a7dba5630 Merge pull request #19775 from coolljt0725/fix_prepare_mount
daemon: don't prepare mountpoint for restart container
Upstream-commit: f4e5eb3f86a6d8681bbf85d5f46d589c242a3578
Component: engine
2016-01-27 16:11:12 -05:00
8977875ac5 Add tag support to journald logging driver, closes #19556
Signed-off-by: Ivan Babrou <ibobrik@gmail.com>
Upstream-commit: 5a3351883b254d3690e9dcc5b89293bcee474493
Component: engine
2016-01-27 10:52:19 +00:00
2336bc4aed Correct the info message when stop container
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 6716a3a167fcd0a9abc013ce536117175922af96
Component: engine
2016-01-27 03:06:45 -05:00
2fd968f843 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>
Upstream-commit: 0feeab2e43a75bee3d5709248544b3078df96706
Component: engine
2016-01-27 02:43:40 -05:00
9669dc677a 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>
Upstream-commit: 3cf82ff1ab14e1ddd2b629524e894ac359168388
Component: engine
2016-01-27 09:05:44 +02:00
ee42d601b2 Merge pull request #19717 from coolljt0725/fix_load
Daemon: do GetRWLayer after checking if container support the current graph driver
Upstream-commit: 63f8429bf0152bf0e8903ab4def18295bd6d4e1d
Component: engine
2016-01-26 21:55:32 -08:00
4c547f393d Merge pull request #19722 from WeiZhang555/exec-restarting
Forbid exec a restarting container
Upstream-commit: 0ae94303b89a9648f26b599617a9d78ee5284a4c
Component: engine
2016-01-27 11:43:43 +08:00
7377fa761c Merge pull request #19604 from Microsoft/jjh/testrename
Windows CI: Fix TestRename*
Upstream-commit: 70c5e96cb8bd6b826006f73102135bf74e2fa877
Component: engine
2016-01-26 19:03:31 -08:00
1083d494cd Forbid exec a restarting container
Currently if we exec a restarting container, client will fail silently,
and daemon will print error that container can't be found which is not a
very meaningful prompt to user.

This commit will stop user from exec a restarting container and gives
more explicit error message.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 1d2208fed90da9ab72ded3b1c65bb2a71b66ce93
Component: engine
2016-01-27 10:05:06 +08:00
c0b7e34886 Daemon: do GetRWLayer after checking if container use the current graph driver
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 899f1b18707d035a1dca73cae0dd7b3bfe65c046
Component: engine
2016-01-26 20:20:30 -05:00
a374e9a1d6 Merge pull request #19737 from calavera/fix_reload_docs
Remove cluster storage advertise from reload.
Upstream-commit: 7992b353c04b4214c28d5be6195b2703a52defb1
Component: engine
2016-01-26 17:04:46 -08:00
25f186f583 Merge pull request #19688 from crosbymichael/tmpfs-tar
Remove tar copy-up for tmpfs mounts
Upstream-commit: 3a70ab3a2c78ab40a5fdfe55be5745753eb41139
Component: engine
2016-01-26 17:03:07 -08:00
2a5a8c6749 Remove cluster storage advertise from reload.
Because libnetwork won't really send container information to the new
storage anyways.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: fa163f5619bb01cabca1c214b59e14518a797a7a
Component: engine
2016-01-26 18:19:30 -05:00
92c9319930 Merge pull request #19671 from calavera/volume-dangling
Make volume dangling filter return only used volumes with `dangling=false`.
Upstream-commit: 146e49b039c59107cc31de734f0bf5d4604c04d9
Component: engine
2016-01-26 17:01:20 -05:00