112e739739
Updated Oracle Linux install documentation to be more accurate.
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: 081bffc1e1ff869a8215b9b8b439d4cb9f6a144a
Component: engine
2016-01-23 12:18:41 +11:00
81c64b3dad
Merge pull request #19567 from Microsoft/jjh/testpsnotshowportsofstoppedcontainer
...
Windows: TestPsNotShowPortsOfStoppedContainer linux only
Upstream-commit: 504a8ad2954f8e28dbd556edee5cc136e1f8854c
Component: engine
2016-01-22 21:53:31 +01:00
6c368a5493
Merge pull request #19190 from srust/volume_driver_parity_again
...
Allow external volume drivers to host anonymous volumes again
Upstream-commit: 455a505749ff5db0d6f997b249234d0f1135fe5a
Component: engine
2016-01-22 15:53:06 -05:00
44fa01bbec
Merge pull request #19517 from calavera/validate_config_keys
...
Verify that the configuration keys in the file are valid.
Upstream-commit: 34a83f9f2c0516b3c5e7024393487eee54309401
Component: engine
2016-01-22 15:01:29 -05:00
5696850b38
Merge pull request #19509 from BrianBland/master
...
Fixes layer MediaTypes in manifests created from a cross-repository push
Upstream-commit: 2731dbc7977dba00405c974c47c4f079d441a2b2
Component: engine
2016-01-22 14:27:47 -05:00
9aa26ba55a
Make TLSOptions and LogConfig embedded structs.
...
That way the configuration file becomes flag, without extra keys.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 5e80ac0dd183874ab7cd320a8bd0f0378dbd1321
Component: engine
2016-01-22 13:20:17 -05:00
50fb232049
Merge pull request #19549 from cpuguy83/bump_plugin_api_version
...
Bump plugin API version
Upstream-commit: ae8f7c69e3fdbf39b8e0780813d550588e27414e
Component: engine
2016-01-22 09:33:29 -08:00
fba580f28b
Merge pull request #19146 from mikedougherty/cs-105-download-script
...
Create a bundle for the install script to support other domains
Upstream-commit: 21ec6d3789b93aad5788785cf4be4a2445044375
Component: engine
2016-01-22 09:25:24 -08:00
17026542ae
Merge pull request #19573 from sanimej/libn
...
Vendor in libnetwork v0.6.0-rc2
Upstream-commit: a9fc4939dfd864bc2ab2c9bc1dc0211feb03ec65
Component: engine
2016-01-22 12:07:40 -05:00
be90174e6c
Merge pull request #19588 from tianon/docker.default-systemd
...
Add a note to /etc/default/docker noting that it does not apply to systemd
Upstream-commit: 05b2f342fd73d1624fac3d3107700d05caa0ac18
Component: engine
2016-01-22 08:52:02 -08:00
7dc1824c45
Merge pull request #19470 from Microsoft/jjh/confans
...
Windows: VirtualTerminalInput native console
Upstream-commit: 73ae424ed8a8cdd9cfe2d70c3334bcbe27cb9e91
Component: engine
2016-01-22 17:27:47 +01:00
4b43f56b91
Merge pull request #19488 from hypriot/enable-docker-trust-suite-on-arm
...
Enable DockerTrustSuite for ARM again
Upstream-commit: cba7ba25f4358c86aee4872186d9dfd2fc3dc0fd
Component: engine
2016-01-22 11:23:19 -05:00
69dd6d149a
Add a note to /etc/default/docker noting that it does not apply to systemd
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 90e33640b883134be0fc7d526d2ba45aa6eef70f
Component: engine
2016-01-22 07:35:02 -08:00
1344a300e6
Merge pull request #19558 from LK4D4/reduce_cgroup_parsing
...
Refactor sysinfo usage
Upstream-commit: c91045a78bf138aa32acd215fed4084d3b912bec
Component: engine
2016-01-22 11:18:53 +01:00
8a2ef4bb80
Merge pull request #19574 from polonskiy/patch-2
...
fixed typo
Upstream-commit: c3a9ecedba41eef71e42bed33fc2b462b9ee1c6a
Component: engine
2016-01-22 09:14:58 +01:00
4172179211
fixed typo
...
Signed-off-by: Anton Polonskiy <anton.polonskiy@gmail.com >
Upstream-commit: b0873c2c5009d4b2f758ea49477b55a2b5600c90
Component: engine
2016-01-22 09:27:53 +02:00
4f27e3ae36
IT for service/network name with '.', corrected libnetwork flag for DNS
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: da9eadb06669b7d2b375424a31991cf97de19900
Component: engine
2016-01-21 20:49:02 -08:00
0704f515fb
Vendor in libnetwork v0.6.0-rc2
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 02c9d48144c0523d59fe4ba1c0b645c17fd05f80
Component: engine
2016-01-21 20:46:28 -08:00
d0c4b1bf31
Create a bundle for the install script to support other domains
...
For the CS Engine we need to have an install script like OSS does, but
the locations are all different, as is the GPG key used. This is
accomplished here by slightly altering the script itself and adding a
simple 'sed' based bundle for make.sh.
This install script is used in to change the URLs instead of sed in
release.sh.
Signed-off-by: Mike Dougherty <mike.dougherty@docker.com >
Upstream-commit: 51dad1185a8dcf55f2e3473b79748e0e72c6590c
Component: engine
2016-01-21 20:42:20 -08:00
2a780dbb98
Merge pull request #19562 from MHBauer/nospace-checktheoutput
...
check the output, not the errcode
Upstream-commit: 6f22d9ec4ec86bfc8f99a700fb89814a452c6cbc
Component: engine
2016-01-21 22:09:41 -05:00
d982e75aca
Windows: TestPsNotShowPortsOfStoppedContainer linux only
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 845dc1b24c2b7083ab5b8a8c21f946fed56e61b1
Component: engine
2016-01-21 18:48:21 -08:00
7141a04b13
Merge pull request #19263 from jfrazelle/update-aa-parser
...
refactor aaparser pkg, add unit tests
Upstream-commit: 3233f4560912fee87857f653a8bb32050dc04927
Component: engine
2016-01-21 19:40:53 -05:00
5179f11960
Merge pull request #19529 from Microsoft/jjh/dockerfile
...
Windows: Update dockerfile for Windows to Windows CI
Upstream-commit: 6e16ec2b9c98bef78bd26800e8b1cfb14a6e92e2
Component: engine
2016-01-21 15:46:08 -08:00
42641a496b
check the output, not the errcode
...
- errcode of 1 can be returned for cases other than the 'no space left' case
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: bcb9adf49e6726eccc1ee1ed41fbe21789c2367f
Component: engine
2016-01-21 15:23:20 -08:00
b3d838e7cb
Merge pull request #19383 from calavera/container_store
...
Extract container store from the daemon.
Upstream-commit: 9ae51b3e0f01111b743c61d8d0811e7061b490df
Component: engine
2016-01-21 17:20:47 -05:00
a73130b07f
Verify that the configuration keys in the file are valid.
...
- Return an error if any of the keys don't match valid flags.
- Fix an issue ignoring merged values as named values.
- Fix tlsverify configuration key.
- Fix bug in mflag to avoid panics when one of the flag set doesn't have any flag.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: ed4038676f09d124180d634ec2cb341745f5fc79
Component: engine
2016-01-21 16:56:12 -05:00
84f68b3062
Merge pull request #19557 from tiborvass/karkhaz-add-dead-to-docker-ps-documentation
...
Carry 19305: Added `dead` to docs for docker ps -f status=...
Upstream-commit: 45db4fa70eb3d33230e38457fd98b1f5403e70d6
Component: engine
2016-01-21 13:46:51 -08:00
e6386361f9
Added dead to docs for docker ps -f status=...
...
It is possible to invoke `docker ps -f status=dead`, but the
documentation for docker-ps does not mention `dead` as a valid option.
This commit fixes that.
Signed-off-by: Kareem Khazem <karkhaz@karkhaz.com >
Upstream-commit: 859262a82abb482f54577935dc44c74e135dcd05
Component: engine
2016-01-21 16:44:33 -05:00
a7b9f6d573
Merge pull request #19316 from Microsoft/jjh/incontainererror
...
Windows: In container build check
Upstream-commit: e287bef453f2b4419a26e9bfa94987f13aa8376f
Component: engine
2016-01-21 13:44:19 -08:00
9b2be4c8e0
Merge pull request #19552 from aaronlehmann/vendor-distribution-3
...
Vendor updated distribution package
Upstream-commit: 3ecba7089be0fec32ab46f3bf55deb7878562b6d
Component: engine
2016-01-21 16:21:59 -05:00
fb1bb8a419
Windows: In container build check
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4dbd612d474317fdd7bd983f2d1a05654c2ceaad
Component: engine
2016-01-21 13:15:23 -08:00
da964dbf58
Windows: Update dockerfile.windows
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: eacd2fd4daa03b1161d879e835705f7d35b871e3
Component: engine
2016-01-21 12:49:03 -08:00
3a243c7d02
Merge pull request #19550 from Microsoft/jjh/testlinksmultiplewithsamename
...
Windows: Fix TestLinksMultipleWithSameName
Upstream-commit: 0b7e9ef910b91a0a8cb334db852ad143c4660155
Component: engine
2016-01-21 15:38:47 -05:00
91f8ed84f8
Merge pull request #19551 from aaronlehmann/fix-retry-on-enospc
...
Don't retry downloads when disk is full
Upstream-commit: 26334b7a7d80fe233f27773bb65ac2d57d3af2a0
Component: engine
2016-01-21 15:37:50 -05:00
3dfe6e550f
Merge pull request #19524 from LK4D4/iocopy_writeto
...
Use bufio.Reader in io.Copy source for overlay.copyRegular
Upstream-commit: d2448a0c201592f93996a807a416016914efaccd
Component: engine
2016-01-21 15:37:12 -05:00
945f16abd0
Merge pull request #19518 from dmcgowan/unwrap-url-error-on-retry
...
Unwrap URL errors on retry
Upstream-commit: 16faf8f1fcc936e0776b067b26b4c01ede1af1d1
Component: engine
2016-01-21 15:36:41 -05:00
e43ee5b6f8
Vendor updated distribution package
...
Another day, another revendor.
This revision of distribution is more tolerant of incorrect Content-Type
headers when fetching manifests.
Fixes #19526
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 921eae9d6d028187daff7521740977b07414b631
Component: engine
2016-01-21 11:01:14 -08:00
713774ce46
Merge pull request #19548 from WeiZhang555/remove-hard-coded
...
Remove hard coded 'docker' string from package
Upstream-commit: b7a68d0252d0cfcfdd33612f2267c0da926c8a4c
Component: engine
2016-01-21 13:06:22 -05:00
305118a342
Don't retry downloads when disk is full
...
There was already a check that prevented protocol-level fallback in this
situation, but retries within a specific protocol will still happen.
This makes it take a long time for the pull to finally error out.
This fixes slowness in TestDaemonNoSpaceleftOnDeviceError, which used to
take a long time due to the backoff between retry attempts:
PASS: docker_cli_daemon_test.go:1868: DockerDaemonSuite.TestDaemonNoSpaceleftOnDeviceError 5.882s
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 4f13ec5551076505395ad5b1c099f47eca06e63e
Component: engine
2016-01-21 10:01:51 -08:00
34ac1eb837
Merge pull request #19547 from tonistiigi/revert-aufs-hardlinks
...
Revert "Copy aufs hardlinks to top layer"
Upstream-commit: eacc9fc2c30be835ae31719dbc74a29c2dd26488
Component: engine
2016-01-21 09:56:26 -08:00
00230ffb92
Windows: Fix TestLinksMultipleWithSameName
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 473a32ba8f2d2d97eb0b3b745392f8b567fbaa2d
Component: engine
2016-01-21 09:52:49 -08:00
5f04a8c8b6
Merge pull request #19349 from jfrazelle/add-link-to-wiki
...
add warning if upgrading via script to migrate
Upstream-commit: 5f9375cf390b9a0ea04aba8b6bafa83a8879cb65
Component: engine
2016-01-21 12:51:25 -05:00
eb8e91aac7
Merge pull request #19541 from albers/completion-events
...
Support new events in bash completion
Upstream-commit: 7aef3112692d115ac1fdd60ec06cb501c21ef1fc
Component: engine
2016-01-21 18:40:54 +01:00
128e0a1c5a
Merge pull request #19423 from jfrazelle/apparmor-no-install
...
disable install of docker-engine for 1.10, try to get ready for 1.11
Upstream-commit: 7d19ca7c40bc2b5172854ce073a6d11175027d82
Component: engine
2016-01-21 12:08:50 -05:00
091ca20c63
Use pools.Copy instead of io.Copy for overlay.copyRegular
...
That function is pretty heavy used on container start. Autoallocating
buffer can be painful.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 3f5e1c69b345b25d9b1c57f5d492a0e3fd4432a0
Component: engine
2016-01-21 08:53:37 -08:00
7e789b4066
Bump plugin API version
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 54587d861d6664d6d32bc62a46c0c7ea0c7853e6
Component: engine
2016-01-21 11:41:32 -05:00
61ae1fb997
Merge pull request #19507 from aaronlehmann/certificate-error-message
...
Clarify error message when a .cert file is missing a corresponding key
Upstream-commit: aed5691644d96a8ae9522a9c8c8d325bbb14c7f3
Component: engine
2016-01-21 08:29:25 -08:00
c20140ef75
Merge pull request #19540 from A33a/A33a-patch-1
...
Fixed typo in "/etc/subUid"
Upstream-commit: 5e143d51683027e93169a66475cf28944b031daa
Component: engine
2016-01-21 17:24:29 +01:00
4787976da3
Merge pull request #19522 from aaronlehmann/vendor-distribution-2
...
Vendor updated distribution
Upstream-commit: 8c0dd9d1821fe99fa720de84a4bf96e6fb50f94b
Component: engine
2016-01-21 08:15:41 -08:00
e789dfd374
Remove hard coded 'docker' string from package
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: d44e79a3661be67c49899c3a3e5c3773b8c21073
Component: engine
2016-01-22 00:14:52 +08:00
