Commit Graph

21804 Commits

Author SHA1 Message Date
26b759d185 Merge pull request #19731 from albers/completion-daemon--userns-remap
bash completion for `docker daemon --userns-remap`
Upstream-commit: 1584e63b9e926b963fe88e22b40d4c04107050de
Component: engine
2016-01-26 13:14:56 -08:00
24442de326 Windows CI: Enable TestHistory* cli tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 15c32f39a94bb389087389e03ae4e2429dc851a0
Component: engine
2016-01-26 12:42:09 -08:00
665c7f7ff1 Set idle timeouts for HTTP reads and writes in communications with the registry
Otherwise, some operations can get stuck indefinitely when the remote
side is unresponsive.

Fixes #12823

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 84b2162c1a15256ac09396ad0d75686ea468f40c
Component: engine
2016-01-26 12:40:39 -08:00
b6a52ab8d2 Windows CI: Port TestRmi tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 94e5fab5ed04a6cd47a4aa74024f79c75aadca03
Component: engine
2016-01-26 12:22:37 -08:00
3c263eb202 First batch of Windows-Windows TestBuild CI enabling
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 563a4d1b9f75eed5531565e70a3518cab16fa825
Component: engine
2016-01-26 12:15:13 -08:00
81922b0d60 Update notary to 1.10-3 in all Dockerfiles
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: 589c8a879fea758007a36bd0f00d07aa1000d0cb
Component: engine
2016-01-26 11:51:22 -08:00
f352b24e50 Adjust version string processing for RPM build
This will only trim off the last '-' separated token to be checked for
RC status. This allows including a 'cs#' token in the version string.

Signed-off-by: Mike Dougherty <mike.dougherty@docker.com>
Upstream-commit: 04100233679124a2d0b6c622cec81954f3aaf38d
Component: engine
2016-01-26 11:49:59 -08:00
bed434b1dc Vendoring libnetwork v0.6.0-rc5
- Cleanup stale overlay sandboxes

Fixes #19694

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 730a6d2fc22f9efdb18a79b39935f1438a5e5f84
Component: engine
2016-01-26 11:44:43 -08:00
71c71e17c6 Fix bash completion for docker volume ls --dangling=false.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9e2b63e0aeec264a65c9684fe825e857c3e272d6
Component: engine
2016-01-26 14:29:37 -05:00
b200f85ceb Use imageStore.Children instead of whole the Map
daemon cache was getting the whole image map and then iterating through
it to find children. This information is already stored in the image
store.

Prior to this change building the docker repo with a full cache took 30
seconds.
After it takes between 15 seconds or less (As low as 9 seconds).
This is an improvement on docker 1.9.1 which hovered around 17 seconds.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 1350e8b7b8025d73056b800963c001fb9619a85c
Component: engine
2016-01-26 14:12:56 -05:00
dcca310e82 Let bash completion for docker network rm only complete custom networks
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 0e1bfdd43eeebe02402e9b1bb4ef995084c13676
Component: engine
2016-01-26 10:57:38 -08:00
c572fa49af Windows CI: Port TestTag* cli tests
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 1723c6477f93c2cdb57212c188c7121211bba82b
Component: engine
2016-01-26 10:41:31 -08:00
aa78ebdfe7 Merge pull request #19013 from hqhq/add_support_docker_aarch64
Add support for build and test docker on arm64
Upstream-commit: b5420be597ea9ce6a0ea7f544a141711289cd3da
Component: engine
2016-01-26 10:33:48 -08:00
682d79bd90 bash completion for docker daemon --userns-remap
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: 62f366490b87457e1fb52a09405691cc18787a2e
Component: engine
2016-01-26 10:24:47 -08:00
b999875432 update tools urls and remove things we dont use
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 8ea5051e78375b9dce7e8cd442d3e263b3b1eb02
Component: engine
2016-01-26 10:15:47 -08:00
57013f74fa Merge pull request #19712 from runcom/test-requires-apparmor
integration-cli: require Apparmor
Upstream-commit: c56e309d05a121a509716f887ebc9df065a8fd18
Component: engine
2016-01-26 09:18:29 -08:00
eed5e0f1c7 Merge pull request #19705 from mavenugo/18222
Vendor libnetwork v0.6.0-rc4 & corresponding changes in engine for port-map sandobx handling.
Upstream-commit: 269a6d7d3656fe7edf7cb630125ee4664dd24c78
Component: engine
2016-01-26 09:16:57 -08:00
12928bbe9c Merge pull request #19490 from cyphar/remove-dockerinit
Remove dockerinit once and for all
Upstream-commit: 7a97e938e2229fa7a50b0f6e66c70eddcb9d2dc2
Component: engine
2016-01-26 08:27:35 -08:00
fa73e1295e Stop referring to requested IP address as "preferred",
since it is an error if that address is unavailable.

Signed-off-by: Bryan Boreham <bjboreham@gmail.com>
Upstream-commit: 7126ecd0ad1f6188540949cbdbca20f4a75d1839
Component: engine
2016-01-26 15:13:26 +00:00
fc9234dc9d Merge pull request #19715 from coolljt0725/fix_test_daemon
Test utils: fix daemon start utils
Upstream-commit: fc8e3442976c189cfc770ca2dcedbf68cd8a9a1b
Component: engine
2016-01-26 10:08:50 -05:00
286b4c8bf1 Merge pull request #19713 from WeiZhang555/opt-TestEventsContainerFailStartDie
Optimize `TestEventsContainerFailStartDie`
Upstream-commit: e5b5c0ebe80a3f65f8583ffe31eb692686965fef
Component: engine
2016-01-26 09:32:52 -05:00
7bc1dfc4e5 vendor: update engine-api
This removes all references to InitPath and InitSha1, as well as pulling
in a few other minor engine-api fixes.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 71c63aa72e3788af27fef0de9005cde6c7728a2b
Component: engine
2016-01-27 00:34:31 +11:00
31ed090a9a Test utils: fix daemon start utils
User call `Start` could with args, and the args could
contains `--storage-driver`, but in `Start`, it will add
`--storage-driver` even though user has specified `--storage-driver`
in args.

Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: e88258ca2ef0047973168a29fd9ec27669582c0e
Component: engine
2016-01-26 08:31:50 -05:00
924f35dee7 *: remove documentation references to dockerinit
While the documentation is very patchy on dockerinit, remove all
references in packaging documentation to the now purged dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: e72192be404c9a8489191d43fd6e5c429081d5c8
Component: engine
2016-01-26 23:47:02 +11:00
4edafc3bc1 *: purge dockerinit from source code
dockerinit has been around for a very long time. It was originally used
as a way for us to do configuration for LXC containers once the
container had started. LXC is no longer supported, and /.dockerinit has
been dead code for quite a while. This removes all code and references
in code to dockerinit.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
Upstream-commit: 4357ed4a7363a1032edf93cf03232953c805184f
Component: engine
2016-01-26 23:47:02 +11:00
578fa2d8c0 Move port-mapping ownership closer to Sandbox (from Endpoint)
https://github.com/docker/libnetwork/pull/810 provides the more complete
solution for moving the Port-mapping ownership away from endpoint and
into Sandbox. But, this PR makes the best use of existing libnetwork
design and get a step closer to the gaol.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: e38463b2779f455b4173171d5a1fdb115180a7e9
Component: engine
2016-01-26 03:59:03 -08:00
d169ea09c5 Optimize TestEventsContainerFailStartDie
Optimize performance of `TestEventsContainerFailStartDie`

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 4f7dda3fb29b2ac39731b1a54571ad96435fff83
Component: engine
2016-01-26 19:23:18 +08:00
8ef9af1262 integration-cli: require Apparmor
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 7ac8c778779253a5debff36453c9c31900e534e9
Component: engine
2016-01-26 11:57:14 +01:00
dda7a5fe00 Merge pull request #19154 from hqhq/hq_verify_cgroupparent
Verify cgroup-parent name for systemd cgroup
Upstream-commit: 141a301dca9ff00259157116f479e1c8405a9c14
Component: engine
2016-01-26 11:44:31 +01:00
46aa3a9f0e Merge pull request #19703 from mountkin/speedup-TestEventsAttach
optimize DockerSuite.TestEventsAttach
Upstream-commit: 613e91f36fca59aaa6225ff9a3acd501583e2d85
Component: engine
2016-01-26 11:41:31 +01:00
3b18dd77a9 Merge pull request #19103 from vdemeester/events-with-attributes
Add the possibility to log event with specific attributes
Upstream-commit: 1f2917602e5319a5d6d26caa52e7c964f120b5e5
Component: engine
2016-01-26 11:01:23 +01:00
a7b8a75b2e Merge pull request #19706 from pwnall/patch-2
Add missing words in selectadriver.md
Upstream-commit: cca1e5b2eb06e879d4a2ba295fa77e8b93c6ff0e
Component: engine
2016-01-26 10:57:17 +01:00
bc025bbadc Merge pull request #19701 from aaronlehmann/remove-downloads-on-error
Remove temporary layer download file on error
Upstream-commit: 4158b671f3c5ac13605892aa31c0a9ed22f2e8fd
Component: engine
2016-01-26 10:55:43 +01:00
25849c48bc Merge pull request #19057 from dnephin/remove_version_from_registry_pkg
Remove dockerversion from registry package
Upstream-commit: 07e2dedecb3a0b7381ebf0f8fb4d08d082754cd0
Component: engine
2016-01-25 22:45:06 -08:00
d6c8f86a9c Merge pull request #19468 from jfrazelle/refactor-sec-profiles-into-own-pkg
Refactor sec profiles their own packages
Upstream-commit: c5380f9118e3fede06864346509743b511d91477
Component: engine
2016-01-25 22:18:56 -08:00
ae9bd7f8a5 Add missing words in selectadriver.md
Signed-off-by: Victor Costan <costan@gmail.com>
Upstream-commit: e5e90347d28c11b6000cb5471454d24f3aa8b421
Component: engine
2016-01-26 01:06:59 -05:00
36c72742b4 Vendor libnetwork v0.6.0-rc4
- Add Endpoints() API to Sandbox interface
- Fixes #19677

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 7029d9e6ad766492c2619084c13a8ef88167eddf
Component: engine
2016-01-25 19:51:21 -08:00
531573357d Merge pull request #19683 from calavera/network_config_file
Allow network configuration via daemon config file.
Upstream-commit: 5b0183e91c173c06bcbb5d53da03f13519c14c87
Component: engine
2016-01-25 18:59:20 -08:00
6122ebd263 optimize DockerSuite.TestEventsAttach
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 77a0f77e7f605cfe322ce66cf69b3571293a7aeb
Component: engine
2016-01-26 10:45:45 +08:00
1a98d85d03 Remove temporary layer download file on error
Currently, the temporary file storing downloaded layer data is only
removed after a successful download or a digest verification error. A
transport-level error does not cause it to be removed. This is a
regression from 1.9 that could cause disk usage to grow until the Docker
daemon is restarted.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 5a363ce60bee3dc26a433c7e2cee6dc76939849e
Component: engine
2016-01-25 18:20:18 -08:00
360e6f6c70 Merge pull request #19568 from cpuguy83/17907_fix_rmv
On container rm, don't remove named mountpoints
Upstream-commit: 58c2488d07f4c984c853ca4b4a5c86b55c4c784c
Component: engine
2016-01-25 18:13:57 -08:00
b0fd1577e0 Merge pull request #19687 from tianon/debian-wheezy
Change the way we install from backports in the deb builder (to force deps too)
Upstream-commit: ced2d37901588f5dc8b94a45bb8686e8fbb943a4
Component: engine
2016-01-25 17:13:49 -08:00
32f69056a3 Merge pull request #19673 from aboch/epcs
Save endpoint config only if endpoint creation succeeds
Upstream-commit: 2cb8fdd3279344b10b0ba651ca42ea38fd88c42f
Component: engine
2016-01-25 16:50:47 -08:00
38766d158c Merge pull request #19676 from cpuguy83/19672_fix_force_rm
Fix removing mountpoints on container rm fail
Upstream-commit: d4ccd948e9db3ed8d27ec53d738133fd11fec454
Component: engine
2016-01-25 16:44:25 -08:00
c43bc4b09f Merge pull request #19680 from mavenugo/rc2-vin
Vendor libnetwork v0.6.0-rc3
Upstream-commit: 8d096114f2d30afb1c007da3fb99a04d65f5dbcd
Component: engine
2016-01-25 16:07:56 -08:00
3ec10b17fa Allow network configuration via daemon config file.
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: c539be88332815aeb2d466a973443127c1c676a6
Component: engine
2016-01-25 18:54:56 -05:00
2c020b81f9 Merge pull request #19074 from arun-gupta/couchbase
adding docs for Dockerizing Couchbase service
Upstream-commit: 2b97c9674258e0dc0b36526176b2f2cea85b40fe
Component: engine
2016-01-25 15:46:56 -08:00
e8b8068b46 Merge pull request #19682 from aaronlehmann/transfer-release-race
Fix watching a released transfer
Upstream-commit: 31adcc96d0d2fd796d3ec204f0dd827f3e63d64a
Component: engine
2016-01-25 15:37:47 -08:00
2ab9f176ff Merge pull request #19560 from aboch/mn
Reject multiple networks on container creation request
Upstream-commit: f7abff4f818847694f4a9beeeef63879d28e0e60
Component: engine
2016-01-25 14:57:51 -08:00
09854fa6a5 Change the way we install from backports in the deb builder (to force deps too)
Also, add "libsystemd-journal-dev" to the explicit list (which is what prompted the change in how we install).

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: 722fac7a730e16c65ccd60ce5d1d7924dd6520bf
Component: engine
2016-01-25 14:49:05 -08:00