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
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
0e8c018223
Windows CI: Turn off failing unit tests pkg\integration
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5f2ba2b9ba5d1030dacb6c686d12c6a91c3c0612
Component: engine
2016-03-02 19:37:18 -08:00
e008756651
Windows CI: Turn off failing unit tests pkg\graphdb
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 9f5984d93fc4902d15904809015627b959bf11a1
Component: engine
2016-03-02 19:27:41 -08:00
2aa4a4fc21
Windows CI: Turn off failing unit test pkg\fileutils
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3e78ad7be2c702a51c752965ba10d8fa9c6e9738
Component: engine
2016-03-02 19:05:33 -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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
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
Sebastiaan van Stijn
Vincent Demeester
John Howard
Brian Goff
Jessica Frazelle
David Calavera
Arnaud Porterie
Yong Tang
Aaron Lehmann
Antonio Murdaca
Alexander Morozov
Sebastiaan van Stijn
Shijiang Wei
Qiang Huang
John Starks
Dong Chen
Darren Stahl
Tibor Vass