Commit Graph
22904 Commits
Author SHA1 Message Date
Arnaud Porterie 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
Sebastiaan van Stijn d823347712 Vendor engine-api
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: dd850530a96baef9f109fd2292f8c51a0836eefc
Component: engine
2016-03-02 23:32:25 +01:00
Sebastiaan van Stijn 7f5a363deb Add KernelMemory to "info" and show warning
This change adds "KernelMemory" to the /info endpoint and
shows a warning if KernelMemory is not supported by the kernel.

This makes it more consistent with the other memory-limit
options.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 747a486b4aac2ebbbb28bd713b9a4a929f89353b
Component: engine
2016-03-02 23:32:25 +01:00
John Howard 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
Vincent Demeester 576af48c09 Merge pull request #20388 from hqhq/hq_add_cgroup_driver_info
Add CgroupDriver to docker info
Upstream-commit: 508a17baba3c39496008fc5b5e3fe890b8a1b31b
Component: engine
2016-03-02 23:17:27 +01:00
John Starks 038a7f9bf3 Revendor Microsoft/go-winio and Microsoft/hcsshim
Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 882edc3f0e92483ccf9b7d4b32c5a63f73e12bbe
Component: engine
2016-03-02 14:17:13 -08:00
David Calavera 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
Yong Tang 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
Vincent Demeester 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
John Howard 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
Sebastiaan van Stijn 07a52ba87f Merge pull request #20839 from icecrime/failing_ci_label
Introduce `status/failing-ci` label
Upstream-commit: 34a56d2cae6f04a4a759f7055864f7d4615777a7
Component: engine
2016-03-02 19:08:56 +01:00
Aaron Lehmann 94732a171a Merge pull request #20868 from LK4D4/unused_ctx
Remove unused ctx from v1Pusher
Upstream-commit: 613d364e238ca002c502bcaf6b61760066ef956a
Component: engine
2016-03-02 10:05:46 -08:00
David Calavera 4a285f2027 Call plugins with custom transports.
Small refactor to be able to use custom transports
to call remote plugins.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1a630234508bdb12d55425ceebdb0b6523a38578
Component: engine
2016-03-02 12:54:53 -05:00
Vincent Demeester 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
John Howard 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
Antonio Murdaca 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
Antonio Murdaca 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
David Calavera 2d730b8156 Merge pull request #20475 from Microsoft/jstarks/filegetter
graphdriver: Replace DiffPath with DiffGetter
Upstream-commit: 8f109829e294371cbae1eebfc771eda96d92187f
Component: engine
2016-03-02 08:36:36 -08:00
Alexander Morozov 098b339ade Remove unused ctx from v1Pusher
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a4dbbe7d898ae6db366076cbe13049a8f88fc731
Component: engine
2016-03-02 07:59:12 -08:00
Antonio Murdaca 7ee2a1750b Merge pull request #20861 from thaJeztah/docs-improve-userns-note-for-fedora
docs: improve note for Fedora 22
Upstream-commit: 7c64681ce00f725bad79ee46c501192c961ab376
Component: engine
2016-03-02 16:12:11 +01:00
Sebastiaan van Stijn e53352c54a docs: improve note for Fedora 22
Move the note more up, to prevent people from starting
the daemon with --userns-remap before touching the files.

Also clarify that these steps must be done *before* enabling
userns-remap and starting the daemon.

Also fixed some minor Markup formatting issues.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 069da069cb5386e6a441f34d5813a94fc738de59
Component: engine
2016-03-02 14:46:18 +01:00
Shijiang Wei 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
Qiang Huang 17d0f2d01e Add CgroupDriver to docker info
Fixes: #19539

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: ca89c329b9f0748da74d08d02a47bc494e7965e2
Component: engine
2016-03-02 20:07:06 +08:00
Vincent Demeester 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
Wen Cheng Ma a2c76ae251 Add tests of unsupported network-scoped alias on default networks
Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: 0515d9b9c0cbfa9d10b98c58f428f599174e961e
Component: engine
2016-03-02 16:57:50 +08:00
Vincent Demeester 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
Vincent Demeester 5416da11e0 Merge pull request #20833 from Microsoft/testunit-archive
Windows CI: Unit Tests stop running failing archive test
Upstream-commit: b18f9cc29b8977bc003fd47aa35e8836345c301d
Component: engine
2016-03-02 08:53:11 +01:00
David Calavera 84f6ed6e39 Merge pull request #20842 from dongluochen/IPv6Support
Handle IPv6 entries in discovery
Upstream-commit: 266a75ac2219455d34aa6346596b936f42c20bcd
Component: engine
2016-03-01 21:03:37 -08:00
David Calavera 578a4ff48d Merge pull request #20846 from icecrime/remove_theadactyl
Remove @theadactyl
Upstream-commit: 04a3cedf4471ec9b26ccdb8dd14272b7d78eff89
Component: engine
2016-03-01 21:03:23 -08:00
Arnaud Porterie 0c8e184e27 Remove @theadactyl
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: edeadcd9e1e41a8b2c87f4e7326e8618c578e8d6
Component: engine
2016-03-01 20:07:20 -08:00
David Calavera f185bcb172 Merge pull request #20838 from Microsoft/testunit-chrootarchive
Windows CI: Unit Tests stop running failing chrootarchive tests
Upstream-commit: 911bb1b3b5aa0a85e110ada371a2facbc96e0b4b
Component: engine
2016-03-01 19:48:44 -08:00
John Starks e8bd7774da Windows: Default to npipe transport
This changes the default transport for Windows from unencrypted TCP to
npipe. This is similar to how Linux runs with the unix socket transport by
default.

Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 7e884c6cd024e31fc510451feb177bb4689c1815
Component: engine
2016-03-01 18:27:01 -08:00
Dong Chen e470d00835 Use net.JoinHostPort to handle address format.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: 7554e882dfe3a3eb9ec61457e20a42de528db725
Component: engine
2016-03-01 17:27:30 -08:00
David Calavera a7befe92d9 Merge pull request #20828 from Microsoft/jjh/xenonworkdirfix
Windows: Don't create working dir for Hyper-V Containers
Upstream-commit: 7f223b72dd826c1f925b01d159a97c28983ed07b
Component: engine
2016-03-01 17:11:37 -08:00
Sebastiaan van Stijn 79fb33ace9 Merge pull request #18766 from mikedanese/gcplogs
Add logging driver for Google Cloud Logging
Upstream-commit: 3c4d093babb6f4f4f8343f5c364c5229a9d96ba3
Component: engine
2016-03-02 02:09:44 +01:00
Aaron Lehmann 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
Dong Chen 78aa00dac4 Handle IPv6 entries.
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: f7c9214e29a81679916b953572173393d5e766e5
Component: engine
2016-03-01 16:56:12 -08:00
Sebastiaan van Stijn d9a0ca1c6c Merge pull request #20826 from LK4D4/fix_keys
Fix CONFIG_KEYS check in contrib/check-config.sh
Upstream-commit: 22684de8724a9767c2aee77440a894e1c5aadeb2
Component: engine
2016-03-02 01:47:50 +01:00
Arnaud Porterie 9359836a69 Introduce status/failing-ci label
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: cf6016c24ec698f7eacdbc4e7b1dfe6770f29287
Component: engine
2016-03-01 14:52:11 -08:00
Darren Stahl f7b441f49a Windows CI: Unit Tests stop running failing chrootarchive tests
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 7f6ef097369808d1d4eda52ff7bf0d76579741aa
Component: engine
2016-03-01 14:28:29 -08:00
Sebastiaan van Stijn c772afd645 Merge pull request #20746 from cpuguy83/use_volume_for_bundles_dir
Use anonymous volume for bundles dir
Upstream-commit: 793d3b5a3f54313e6aaef5144877676795a1bf08
Component: engine
2016-03-01 23:24:24 +01:00
John Howard c01546df7d Windows: Don't create working dir for Hyper-V Containers
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5849a5537607f991898247c75e9298492318c7b1
Component: engine
2016-03-01 14:10:40 -08:00
Dan Walsh ddba9dffe5 Do not relabel if user did not request it for non local volumes
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 843a119d49d2b4ba0a15188843b28763b13e62c6
Component: engine
2016-03-01 17:09:42 -05:00
Darren Stahl fe36785c66 Windows CI: Unit Tests stop running failing archive test
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: f9cfc4c38779ea8f443c79eeb8cc1b81e8e8a5e1
Component: engine
2016-03-01 13:27:44 -08:00
David Calavera 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
Arnaud Porterie f87c5bb0dc Merge pull request #20825 from LK4D4/unused
Remove some unused structs and fields
Upstream-commit: 106793dcbe49aedd96d74b0c4b0e32a972032d06
Component: engine
2016-03-01 12:58:35 -08:00
Tibor Vass 307185d18b Merge pull request #20617 from nalind/journald-pkgconfig
Try to handle changing names for journal packages
Upstream-commit: 36401f20ceb8b689fb619df4f6c7219fe76b521c
Component: engine
2016-03-01 15:38:03 -05:00
Derek McGowan 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
Aaron Lehmann 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
Brian Goff e03aa51b61 Merge pull request #20823 from Microsoft/testunit-migratetests
Windows CI: Unit Test stop running failing migration tests
Upstream-commit: 1b6956cbc3454302b4760b46de1710ff6168d83f
Component: engine
2016-03-01 13:50:00 -05:00