Commit Graph

22760 Commits

Author SHA1 Message Date
dfd9e32dcf Merge pull request #20803 from WeiZhang555/empty-stats-no-stream
Bug fix: stats --no-stream always print zero values
Upstream-commit: 160abfbeeaa20314d5d971061d3bad7aaf87e66c
Component: engine
2016-03-05 08:47:41 -05:00
b9d5da8192 Bug fix: stats --no-stream always print zero values
`docker stats --no-stream` always print zero values.

```
$ docker stats --no-stream
CONTAINER           CPU %               MEM USAGE / LIMIT   MEM %
NET I/O             BLOCK I/O
7f4ef234ca8c        0.00%               0 B / 0 B           0.00%
0 B / 0 B           0 B / 0 B
f05bd18819aa        0.00%               0 B / 0 B           0.00%
0 B / 0 B           0 B / 0 B

```

This commit will let docker client wait until it gets correct stat
data before print it on screen.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: ea86c30a4acd53ef626d4c53aaf8f91134173948
Component: engine
2016-03-05 13:22:26 +08:00
687a8bf3a0 Merge pull request #20946 from thaJeztah/update-registry-links
Update links to Docker Hub
Upstream-commit: 44fb8fa588282e2227f2f75841ab6ada1c68da0b
Component: engine
2016-03-04 22:37:57 +01:00
457f1ae82b Merge pull request #20963 from tophj-ibm/properly-close-test-file
Properly close and remove file in daemon test
Upstream-commit: 45865bc4f5e21b2208859c62985a9c4f85660b42
Component: engine
2016-03-04 16:27:07 -05:00
9268540964 Merge pull request #20959 from Microsoft/jjh/bumptimeout
Windows CI: Bump timeout for tests
Upstream-commit: e7cbae9fd6d6d140902bf68e7c9e4c57bbb9f5ad
Component: engine
2016-03-04 11:44:25 -08:00
4e7a6032dd Properly close and remove file in daemon test
Fixes a bug where a file would be created and not deleted in
DockerSuite.TestDaemonDiscoveryBackendConfigReload

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 66e558c16c7505750dc4941980521fc382dbe454
Component: engine
2016-03-04 14:22:30 -05:00
6c9a39a756 Merge pull request #20934 from icecrime/20543_debugging
Fix race condition on daemon shutdown (#20543)
Upstream-commit: 2af84d8875045f853210dcdab2548daaad70856f
Component: engine
2016-03-04 11:08:50 -08:00
b8e42a46b7 Merge pull request #20903 from wenchma/TestDockerNetworkInternalMode
Enhancement of TestDockerNetworkInternalMode
Upstream-commit: ea738c633f2da6041f03703ee294a024db21328b
Component: engine
2016-03-04 20:00:35 +01:00
d4eaa45a84 Windows CI: Bump timeout for tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 6a1ae187d081a5023493ab20fe41ba8a768d62bf
Component: engine
2016-03-04 09:36:46 -08:00
a3ffabb772 Merge pull request #20843 from calavera/plugin_any_transport
Call plugins with custom transports.
Upstream-commit: c08b674d56c37782fc26382f4b756e0518e394cf
Component: engine
2016-03-04 11:59:32 -05:00
41c1b3cb5a Merge pull request #20943 from vdemeester/20942-fix-containerPsContext
Fix #20942 TestContainerPsContext unit test
Upstream-commit: 44b56341d9d40a53ad8d5c2cc87e3c5b2b0f28f3
Component: engine
2016-03-04 16:49:47 +01:00
3276f20bd0 Update links to Docker Hub
Updates links to Docker Hub with their new
URLs to prevent redirects.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 69004ff67eed6525d56a92fdc69466c41606151a
Component: engine
2016-03-04 15:48:52 +01:00
e182a6dd7e Merge pull request #20938 from runcom/split-daemon
integration-cli: move daemon stuff to its own file
Upstream-commit: 29bade2cd0a09191279f04ebc6aeedaa70c772a0
Component: engine
2016-03-04 15:09:35 +01:00
9892cd5446 Try to fix #20942 TestContainerPsContext unit test
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 2787072a65efac3dee0b5299322e4a7cfba51f04
Component: engine
2016-03-04 14:20:41 +01:00
1b65b96bab Merge pull request #20834 from rhatdan/relabelvolume
Do not relabel if user did not request it for non local volumes
Upstream-commit: 8142ebb0be765e6a1ac718d292bb66f7acb145de
Component: engine
2016-03-04 13:17:54 +01:00
63ee158ab3 Merge pull request #20929 from yongtang/19425-DockerSuite.TestBuildDockerignoringWildDirs
Optimize slow bottleneck test of DockerSuite.TestBuildDockerignoringWildDirs.
Upstream-commit: 5f7941e412f36aa6ca7be5b2a3bf18060df051da
Component: engine
2016-03-04 09:47:56 +01:00
684bf382b9 Merge pull request #20872 from duglin/Issue20470
Optimize .dockerignore when there are exclusions
Upstream-commit: 9bc62e6031350d1db24e37cfa4983f719ab5e33b
Component: engine
2016-03-04 09:45:19 +01:00
b84fcf00c1 integration-cli: move daemon stuff to its own file
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 9a9e2bb61d2c0a5bda75ea5679919162f53f3297
Component: engine
2016-03-04 09:29:24 +01:00
c66cb2a6ce Fix race in container creation
Only register a container once it's successfully started. This avoids a
race condition where the daemon is killed while in the process of
calling `libcontainer.Container.Start`, and ends up killing -1.

There is a time window where the container `initProcess` is not set, and
its PID unknown. This commit fixes the race Engine side.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: ad2fa3945997905760a4c7ef0444580ffb4b939a
Component: engine
2016-03-03 20:25:03 -08:00
272f2b442a Merge pull request #20854 from inatatsu/reduce-parsing-mountinfo
Eliminate redundant parsing of mountinfo
Upstream-commit: ea5acb08fa429b1d1833aa855793e8cbfabe25d8
Component: engine
2016-03-03 19:48:32 -08:00
c06c593d4a Enhancement of TestDockerNetworkInternalMode
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 312e20bf6ce7bb396cbc9d05114a66b41f23e3ab
Component: engine
2016-03-04 10:56:10 +08:00
9af5c681c5 Aufs: reduce redundant parsing of mountinfo
Check whether or not the file system type of a mountpoint is aufs
by calling statfs() instead of parsing mountinfo. This assumes
that aufs graph driver does not allow aufs as a backing file
system.

Signed-off-by: Tatsushi Inagaki <e29253@jp.ibm.com>
Upstream-commit: e8513675a20e2756e6c2915604605236d1a94d65
Component: engine
2016-03-04 11:39:59 +09:00
e1bfcc33fd Merge pull request #20927 from Zoltu/patch-1
Adds clarification to behavior of missing directories.
Upstream-commit: cb6cdb416c405c59c7365f261446705d8593bdff
Component: engine
2016-03-04 01:55:27 +01:00
6f468d5dd9 Adds clarification to behavior of missing directories.
Closes #20920

Signed-off-by: Micah Zoltu <micah@zoltu.net>
Upstream-commit: 889d06178adef05d9f9d34a2098f0e6023b84bed
Component: engine
2016-03-03 23:41:13 +00:00
b93d0a36d8 Optimize slow bottleneck test of DockerSuite.TestBuildDockerignoringWildDirs.
This PR fix the DockerSuite.TestBuildDockerignoringWildDirs test
in #19425.
Instead of having multiple RUN instructions in Dockerfile for every
single directory tested, this PR tries to collapse multiple RUN
instructions into one RUN instruction in Dockerfile.
When a docker image is built, each RUN instruction in Dockerfile
will generate one layer in history. It takes considerable amount of
time to build many layers if there are many RUN instructions within
the Dockerfile. Collapsing into one RUN instruction not only speeds
up the execution significantly, it also conforms to the general
guideline of the Dockerfile reference.
Since the test (DockerSuite.TestBuildDockerignoringWildDirs) is
really about testing the docker build with ignoring wild
directories, the purpose of the test is not altered with this PR
fix.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: c77bb28dfb4e248005ed0c447df9d11d1822e133
Component: engine
2016-03-03 23:16:10 +00:00
cde30fac56 Merge pull request #20832 from aaronlehmann/login-endpoint-refactor
Update login to use token handling code from distribution
Upstream-commit: 17156ba98ff8d29048b0f05f600fae9ccbd858a2
Component: engine
2016-03-03 19:04:42 +01:00
195fd50a3b Merge pull request #20914 from yongtang/19425-DockerHubPullSuite.TestPullNonExistingImage
Optimize slow bottleneck test of DockerHubPullSuite.TestPullNonExistingImage.
Upstream-commit: ec79629a47e6a7291832733f5bc6d016cbee971b
Component: engine
2016-03-03 09:51:58 -08:00
c3e3a8fbbe Merge pull request #20901 from HackToday/buildimage
Fix the driver name empty case
Upstream-commit: 89d950303c4156a38f0bdb8e054acaa56e02aa47
Component: engine
2016-03-03 18:44:33 +01:00
f4e1264a9e Merge pull request #20870 from Microsoft/jjh/testupdaterestartpolicy
Windows CI: TestUpdateRestartPolicy flakiness
Upstream-commit: 00f9c2ce59c54d07f934bf48f9806b31c1e667bd
Component: engine
2016-03-03 09:09:56 -08:00
55c975fecc Merge pull request #20906 from runcom/fix-int-tests
integration-cli: fixups
Upstream-commit: ed4a736acccdb678820e04fc798dc6d0ae83e8dd
Component: engine
2016-03-03 09:08:07 -08:00
c06747671b Merge pull request #20262 from cpuguy83/implemnt_mount_opts_for_local_driver
Support mount opts for `local` volume driver
Upstream-commit: c4be28d6a81ce480a24fdba04dc78a3a5c8a1f08
Component: engine
2016-03-03 09:02:12 -08:00
ef22057414 Merge pull request #20913 from estesp/vendor-api-usernsmode
Update engine-api vendor for UsernsMode
Upstream-commit: 0efa5e7366c6a3e7387af8497c86d82b176ce572
Component: engine
2016-03-03 08:59:43 -08:00
e0a2d2cb2d Merge pull request #20730 from clnperez/sysinfo-match-ip-case
Match case for IP variables in sysinfo pkg
Upstream-commit: b7bc1ce1a4be4d309395303cdc573922a48bfd72
Component: engine
2016-03-03 08:48:57 -08:00
3c99541c75 Merge pull request #20890 from riyazdf/notary-snapshot-remote
Rotate snapshot key to server when initializing new notary repos
Upstream-commit: 52d4fff0d7e958e191b1aa9faf2e132c1776c5e4
Component: engine
2016-03-03 08:45:06 -08:00
8bbce28a1d Support mount opts for local volume driver
Allows users to submit options similar to the `mount` command when
creating a volume with the `local` volume driver.

For example:

```go
$ docker volume create -d local --opt type=nfs --opt device=myNfsServer:/data --opt o=noatime,nosuid
```

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b05b2370757d7143d761e5e6abb8c0f9b009f737
Component: engine
2016-03-03 10:32:25 -05:00
27ef35473a Optimize slow bottleneck test of DockerHubPullSuite.TestPullNonExistingImage.
This PR fix the DockerHubPullSuite.TestPullNonExistingImage test
in #19425. The majority of the execution time in this test is
from multiple executions of 'docker pull', each of which takes
more than one second even though it tries to pull a non-existing
image.
Without changing the behavior of the 'docker pull' itself, this
fix tries to execute the 'docker pull' command in parallel in
order to speed up the execution of the overall test.
Since each 'docker pull' is independent, executions in parallel
should not alter the purpose of the test.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 461976d2affe3ed4a354608d1dcb266e06f1d2b9
Component: engine
2016-03-03 14:51:54 +00:00
ccf28f0895 Update engine-api vendor for UsernsMode
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: ee2183881b0273ff1707501e71798a61018f50f0
Component: engine
2016-03-03 09:11:38 -05:00
d784a76fa2 Optimize .dockerignore when there are exclusions
Closes #20470

Before this PR we used to scan the entire build context when there were
exclusions in the .dockerignore file (paths that started with !). Now we
only traverse into subdirs when one of the exclusions starts with that dir
path.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 842b8d8784b132279003580eedd0e9c12b885815
Component: engine
2016-03-03 05:46:24 -08:00
4dd14aa176 Merge pull request #20863 from thaJeztah/add-kernel-memory-warning
Add KernelMemory to "info" and show warning
Upstream-commit: 15e68dc8eefad6b5b125209438a04d1d443e5b26
Component: engine
2016-03-03 13:14:51 +01:00
bfb4a584db Merge pull request #20907 from runcom/seccomp-docs
docs: security: seccomp: mention Docker needs seccomp build and check config
Upstream-commit: d83ad2f554eb3c82b3116de9f8e0f5bce0cb06cc
Component: engine
2016-03-03 12:10:54 +01:00
fdf616950e docs: security: seccomp: mention Docker needs seccomp build and check config
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: dc0397c9a8ae7b5074dfbbad71ed7dd37b163a48
Component: engine
2016-03-03 12:04:09 +01:00
a90312a12e integration-cli: fixups
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 928bfd070b176fbd14639af3e8b9dd260485d9b2
Component: engine
2016-03-03 11:51:59 +01:00
0653c63489 Merge pull request #20882 from Microsoft/jstarks/new_windows_diff_format
Write Windows layer diffs to tar in standard format
Upstream-commit: b76a55308fffe89d5b2fe5930eaa6118d1d5bd9a
Component: engine
2016-03-03 10:51:35 +01:00
814a3aedc4 Merge pull request #20898 from Microsoft/jjh/pslistcontainers
Windows CI: Temporarily disable TestPsListContainers*
Upstream-commit: 1ca5f33b53b8c8cce766bf929fbafd438f0fb845
Component: engine
2016-03-03 10:46:30 +01:00
b38d724754 Merge pull request #20889 from jfrazelle/20888-fix-centos-tests
fix centos when userns not in kernel
Upstream-commit: 01dd7ecffe1416c1897cf1b6ecf3b5905008d964
Component: engine
2016-03-03 10:46:10 +01:00
8e7b2d5a4e Merge pull request #20896 from Microsoft/jjh/unit-pkg-integration
Windows CI: Turn off failing unit tests pkg\integration
Upstream-commit: 174959e8bfc56d73d1f4b2ee0247412f67c89a63
Component: engine
2016-03-03 10:41:21 +01:00
6c3e3e43c9 Merge pull request #20894 from Microsoft/jjh/unit-pkg-graphdb
Windows CI: Turn off failing unit tests pkg\graphdb
Upstream-commit: df1941bf0e70dd3f98c2aadcf56e0df5123b8382
Component: engine
2016-03-03 10:40:22 +01:00
c1b7558776 Merge pull request #20892 from Microsoft/jjh/unit-pkg-fileutils
Windows CI: Turn off failing unit test pkg\fileutils
Upstream-commit: 2348c6a4046f8da6ca69501a8006db42525671f0
Component: engine
2016-03-03 10:39:34 +01:00
b8ad7b3170 Fix the driver name empty case
As drivername maybe "" in hostconfig, so we should not
directly print dirvername with var drivername,
instead, we use the real driver name property to print it.

Fixes: #20900
Signed-off-by: Kai Qiang Wu(Kennan) <wkqwu@cn.ibm.com>
Upstream-commit: 6c78edaf7f22bfe3bd731855f767b9fa3c7d8549
Component: engine
2016-03-03 07:42:28 +00:00
01a7c1e42d Merge pull request #20845 from Microsoft/jstarks/default_to_npipe
Windows: Default to npipe transport
Upstream-commit: 0eb20be13cf61911d030261d98e75cec4723fa88
Component: engine
2016-03-03 08:25:51 +01:00