Commit Graph

2976 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
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
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
b8e42a46b7 Merge pull request #20903 from wenchma/TestDockerNetworkInternalMode
Enhancement of TestDockerNetworkInternalMode
Upstream-commit: ea738c633f2da6041f03703ee294a024db21328b
Component: engine
2016-03-04 20:00:35 +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
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
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
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
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
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
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
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
6f4227aa85 Windows CI: Temporarily disable TestPsListContainers*
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 9af22098af836763e994ac272143ce5717c43fba
Component: engine
2016-03-02 20:43:16 -08:00
33f0caa70a Merge pull request #20884 from Microsoft/jjh/integusenpipe
Windows CI: Allow npipe protocol for sock requests
Upstream-commit: 361a63e5f2b12c62bc3d9d7393129b323b41694a
Component: engine
2016-03-02 20:15:49 -05:00
b4d217e93d fix centos when userns not in kernel
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 7ab696f6b0e2d68cda7e28e68679e0f9fa06ef54
Component: engine
2016-03-02 16:58:49 -08:00
3a79a75181 Rotate snapshot key to server when initializing new notary repos
Signed-off-by: Riyaz Faizullabhoy <riyaz.faizullabhoy@docker.com>
Upstream-commit: f75622e52acad0213b74c6210c73243d82c8f1be
Component: engine
2016-03-02 16:51:32 -08:00
ba183000bc Merge pull request #20824 from runcom/fix-creds-store
cliconfig: credentials: support getting all auths
Upstream-commit: f4cb5f4a32ecb8e6e860b505337331f213658a99
Component: engine
2016-03-02 16:37:57 -08:00
5ec2f24f2e Merge pull request #20880 from yongtang/19425-DockerSuite.TestBuildHistory
Optimize slow bottleneck test of DockerSuite.TestBuildHistory.
Upstream-commit: 9e7b77a585e1601e906a435dbf0cdf0394db61e9
Component: engine
2016-03-02 16:06:12 -08:00
f4ae583b7f Windows CI: Allow npipe protocol for sock requests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 08b65e7dd3e722da535767ee31ac8ed58c0cb3e2
Component: engine
2016-03-02 14:22:51 -08:00
4aa2e2bf12 Merge pull request #20875 from Microsoft/jjh/testlogsapiwithstdout
Windows CI Reliablity: TestLogsApiWithStdout
Upstream-commit: 0e0a8ade618097db7262d496b611730b3592961d
Component: engine
2016-03-02 13:26:39 -08:00
76ebea395f Optimize slow bottleneck test of DockerSuite.TestBuildHistory.
This PR fix the DockerSuite.TestBuildHistory test in #19425.
It changes the base image from busybox into 'minimalBaseImage()'
and changes the RUN in Dockerfile into LABEL, which greatly
reduces the executation time.
Since the test (DockerSuite.TestBuildHistory) is really about
testing docker history, not about RUN in Dockerfile, the
purpose of the test is not altered.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: d609de989f98760e9fca94438184b815fb905681
Component: engine
2016-03-02 20:37:47 +00:00
07a24524a8 Merge pull request #20860 from runcom/fix-logout-credsStore
api: client: fix login/logout with creds store
Upstream-commit: 6dcb14ce05e168c4942fee2ee44a280fd1316590
Component: engine
2016-03-02 20:17:19 +01:00
7af9092c0e Windows CI Reliablity: TestLogsApiWithStdout
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 76a400929343dd9200a2129c561e311c3efaf4cb
Component: engine
2016-03-02 10:26:15 -08:00
3e986fd0f5 Merge pull request #20858 from mountkin/validate-log-opts-again
validate log-opt when creating containers AGAIN (fixing drunkard's code)
Upstream-commit: b65fd8e879545e8c9b859ea9b6b825ac50c79e46
Component: engine
2016-03-02 18:27:00 +01:00
8fa36e15b6 Windows CI: TestUpdateRestartPolicy flakiness
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 16437d6a34a7fe1bace7211c735689fb63f361bd
Component: engine
2016-03-02 09:14:16 -08:00
1bcabe12e7 api: client: fix login/logout with creds store
Make sure credentials are removed from the store at logout (not only
in the config file). Remove not needed error check and auth erasing
at login (auths aren't stored anywhere at that point).
Add regression test.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 0eccc3838e4aac5318e98dcbfbe2100e253462de
Component: engine
2016-03-02 17:51:50 +01:00
049d8d3bcf cliconfig: credentials: support getting all auths
docker build is broken because it sends to the daemon the full
cliconfig file which has only Email(s). This patch retrieves all auth
configs from the credentials store.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 44152144ca766221e97fdaa5200fec3557a64f58
Component: engine
2016-03-02 17:48:56 +01:00
5c70b34f09 validate log-opt when creating containers AGAIN
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 068085005ef378f6320fdce90a67b104399b796d
Component: engine
2016-03-02 20:30:26 +08:00
54b43b2de5 Merge pull request #20841 from aaronlehmann/strengthen-TestPullFromCentralRegistryImplicitRefParts-2
Another attempt to deflake TestPullFromCentralRegistryImplicitRefParts
Upstream-commit: 4eb7a4916f1355ec450ca35c0cdaec1b9a7d0c7e
Component: engine
2016-03-02 10:43:27 +01:00
9c729d183a Merge pull request #20831 from aaronlehmann/concurrent-upload
Fix concurrent uploads that share layers
Upstream-commit: 621a148da3631dd19eee724fb87cf00762aef4a3
Component: engine
2016-03-02 09:09:11 +01:00
213ab0aa23 Another attempt to deflake TestPullFromCentralRegistryImplicitRefParts
Retries after v1 fallbacks were added in #20411. The test still appears
to be flaky. There are two potential problems. The initial pull was not
protected against pulling from v1, so it could be giving us a different
hello-world image to compare against. Also, after experiencing a v1
fallback, we need to restore the original image before doing the next
pull, because otherwise the "Image is up to date for hello-world:latest"
message will not show up as expected.

See #17214.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 0d270cadd4b65623b1f1ae02c4fe5bcc5f81fcd3
Component: engine
2016-03-01 17:02:06 -08:00
65f83ffaae Merge pull request #20817 from tiborvass/skip-TestStatsAllNewContainersAdded-remote-daemon
Skip TestStatsAllNewContainersAdded on remote daemons
Upstream-commit: 32d1a6cee544b0609be4ad8b07dc1794f06b431e
Component: engine
2016-03-01 13:10:44 -08:00
d04c4d1cf0 Login update and endpoint refactor
Further differentiate the APIEndpoint used with V2 with the endpoint type which is only used for v1 registry interactions
Rename Endpoint to V1Endpoint and remove version ambiguity
Use distribution token handler for login

Signed-off-by: Derek McGowan <derek@mcgstyle.net>
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: f2d481a299f7404f5cabbe0f8e6a4ae3c3211c1e
Component: engine
2016-03-01 11:52:32 -08:00
357a20e2b5 Fix concurrent uploads that share layers
Concurrent uploads which share layers worked correctly as of #18353,
but unfortunately #18785 caused a regression. This PR removed the logic
that shares digests between different push sessions. This overlooked the
case where one session was waiting for another session to upload a
layer.

This commit adds back the ability to propagate this digest information,
using the distribution.Descriptor type because this is what is received
from stats and uploads, and also what is ultimately needed for building
the manifest.

Surprisingly, there was no test covering this case. This commit adds
one. It fails without the fix.

See recent comments on #9132.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 5c99eebe81958a227dfaed1145840374ce50bbbb
Component: engine
2016-03-01 11:14:44 -08:00
6b9790d5b0 Merge pull request #20684 from yongtang/13840-follow-symlink
Follow symlink for --device argument.
Upstream-commit: d883002fac7778e70096584c3eed1693eb7cec17
Component: engine
2016-03-01 12:44:10 -05:00
e39ff2ff2f Skip TestStatsAllNewContainersAdded on remote daemons
This test is often failing on remote daemons. We tried many approaches
to fix it but none worked. In order to make the CI more reliable, this
will skip the test when running against a remote daemon (e.g. win2lin).

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e80f86bce8f07122734cf4933e32ac82c9994d71
Component: engine
2016-03-01 11:49:09 -05:00
9fe49cb009 Match case for variables in sysinfo pkg
I noticied an inconsistency when reviewing docker/pull/20692.

Changing Ip to IP and Nf to NF.

More info: The golang folks recommend that you keep the initials consistent:
https://github.com/golang/go/wiki/CodeReviewComments#initialisms.

Signed-off-by: Christy Perez <christy@linux.vnet.ibm.com>
Upstream-commit: 5b3fc7aab25be908cab869dab5c0b2cb821d31dc
Component: engine
2016-03-01 10:37:05 -06:00
afc4d63ffe Merge pull request #20565 from kencochrane/remove_email_on_login
Remove email address field from login
Upstream-commit: 2453262e7ba131fede74dbf31df41da9d2f36c34
Component: engine
2016-03-01 08:02:16 -08:00
cfff83dc7e Follow symlink for --device argument.
Fixes: #13840

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 7ed569efdc822811cdac3b398a16757a54fbe4c4
Component: engine
2016-03-01 07:16:19 +00:00
2919d69a0c Remove email address field from login
This removes the email prompt when you use docker login, and also removes the ability to register via the docker cli. Docker login, will strictly be used for logging into a registry server.

Signed-off-by: Ken Cochrane <kencochrane@gmail.com>
Upstream-commit: aee260d4eb3aa0fc86ee5038010b7bbc24512ae5
Component: engine
2016-02-29 17:53:27 -08:00
6a88816da7 Merge pull request #20782 from estesp/new-parent-dir-ownership
Fix ownership of non-existing parent dir
Upstream-commit: 67b16c73818726d9818d0229fa6cdda3e5f698b0
Component: engine
2016-03-01 01:45:38 +01:00