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
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
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
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
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
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
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
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
209e95dee8
Write Windows layer diffs to tar in standard format
...
Previously, Windows layer diffs were written using a Windows-internal
format based on the BackupRead/BackupWrite Win32 APIs. This caused
problems with tar-split and tarsum and led to performance problems
in implementing methods such as DiffPath. It also was just an
unnecessary differentiation point between Windows and Linux.
With this change, Windows layer diffs look much more like their
Linux counterparts. They use AUFS-style whiteout files for files
that have been removed, and they encode all metadata directly in
the tar file.
This change only affects Windows post-TP4, since changes to the Windows
container storage APIs were necessary to make this possible.
Signed-off-by: John Starks <jostarks@microsoft.com >
Upstream-commit: 5649030e25bd87b4b0bbd200515b8c7317ae8ce1
Component: engine
2016-03-02 16:13:40 -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
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
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
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
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
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
