Commit Graph

22734 Commits

Author SHA1 Message Date
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
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
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
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
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