Commit Graph

2303 Commits

Author SHA1 Message Date
f937755755 Merge pull request #16488 from splunk/splunk_log_driver
Add Splunk logging driver #16207
Upstream-commit: 8d4888df90c30a189821699e444bd6587c035a20
Component: engine
2015-10-23 18:22:14 -07:00
27d55a1112 Merge pull request #16433 from Microsoft/10662-volumes5
Windows: [TP4] Add volume support
Upstream-commit: e74cf8acad799aff39bf1b8ceffdef471aa0d242
Component: engine
2015-10-23 18:43:07 -04:00
7a1aba432f Add Splunk logging driver #16207
Allow to send Splunk logs using Http Event Collector

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
Upstream-commit: 1f1dbf312ddc299bdad408ce3d6b71f4f5993652
Component: engine
2015-10-23 13:37:53 -07:00
95b57bebf2 Merge pull request #17274 from aboch/ai
Turn off discovery when icc == false
Upstream-commit: 2afdc6582b203c2beaeaca6ff14f61ae50f8cab9
Component: engine
2015-10-22 13:08:31 -07:00
553ed6afa5 Turn off service discovery when icc==false
- Turn off built-in service discovery on docker0 bridge
  when icc is false

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 20faaaa872444b6fffbc5a6d30310a782caafe0f
Component: engine
2015-10-22 12:02:02 -07:00
f7f7ce4926 Windows: Add volume support
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a7e686a779523100a092acb2683b849126953931
Component: engine
2015-10-22 10:42:53 -07:00
c9ccdaace3 Merge pull request #17220 from calavera/fix_double_removal
Do not fail when a container is being removed and we request its delete again.
Upstream-commit: 70af70aa0b448b49940f9971bc87ca9ed7cdd9c4
Component: engine
2015-10-21 13:57:16 -07:00
533bd1241f Merge pull request #16890 from runcom/perf-boost
rmi and build cache miss performance improvements
Upstream-commit: 56ef47e881359776638903ef1636cb7030ca5eec
Component: engine
2015-10-21 16:00:25 -04:00
6f2afc4020 Merge pull request #17245 from dhiltgen/discovery_tls
Wire up libnetwork with TLS discovery options
Upstream-commit: 94a16c81f4b6f44c8ffd8974f71c2975d524d32a
Component: engine
2015-10-21 15:20:24 -04:00
64dbd1e1a8 Merge pull request #17213 from calavera/volume_driver_validate_name
Validate volume names for the local driver.
Upstream-commit: 8247eff8a807d88bb683251bdbb16de6a52f0402
Component: engine
2015-10-21 11:48:54 -07:00
77ceb17e18 Merge pull request #16992 from burke/fix-mqueue
Fix --ipc=host dependency on /dev/mqueue existing
Upstream-commit: 678acbcb3fc370e31f677c71a5f8615f2ad3a353
Component: engine
2015-10-21 11:25:37 -07:00
53531be5ba Wire up libnetwork with TLS discovery options
This change exposes the TLS configuration settings to libnetwork so it can
communicate with a key/value store that has been set up with mutual TLS.

TLS options were introduced with https://github.com/docker/docker/pull/16644
Libnetwork support was introduced with https://github.com/docker/libnetwork/pull/602

Signed-off-by: Daniel Hiltgen <daniel.hiltgen@docker.com>
Upstream-commit: 10e7806984947304767690785b6fb329fd93283a
Component: engine
2015-10-21 09:38:58 -07:00
f1b2a78ca3 Move volume name validation to the local driver.
Delegate validation tasks to the volume drivers. It's up to them
to decide whether a name is valid or not.
Restrict volume names for the local driver to prevent creating
mount points outside docker's volumes directory.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d6d60287ee3a8a064340582d65c131181ae77127
Component: engine
2015-10-21 12:28:26 -04:00
58dd738ff1 daemon: faster image cache miss detection
Lookup the graph parent reference to detect a builder cache miss before
looping the whole graph image index to build a parent-children tree.

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: f9e81b40f4065e3d0851172759ef58fda6572cce
Component: engine
2015-10-21 17:13:45 +02:00
d7d07ab148 graph: add parent img refcount for faster rmi
also fix a typo in pkg/truncindex package comment

Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 56f5e3459f8d7477d2aa60dee02bc7cd8a8731ad
Component: engine
2015-10-21 17:13:45 +02:00
a8c08d4980 Merge pull request #17202 from aboch/ipa
Do not mask ipam driver if no ip config is passed
Upstream-commit: 78e21679761c4aa2ea6b1254bf66525088ff0460
Component: engine
2015-10-20 19:45:08 -04:00
130257f149 Do not fail when a container is being removed and we request its delete again.
Abort the process and return a success response, letting the original
request finish its job.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: c4e49d10143178c718178ff7ce857f4f8ed46a0b
Component: engine
2015-10-20 18:48:34 -04:00
834dc8ee1e Merge pull request #17177 from runcom/bc-fixes
Return empty Config fields, now omitempty, for API < 1.21
Upstream-commit: c516aa645ee407c4b67033b20fcf5c2849b98f21
Component: engine
2015-10-20 16:39:53 -04:00
988eb3b3bf Do not mask ipam driver if no ip config is passed
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 27f908a051eb835c7cab59e596b8dee7ca92873b
Component: engine
2015-10-20 11:19:37 -07:00
fdccaa20d5 Merge pull request #17176 from rhvgoyal/fix-locking-issue
devmapper: Drop devices lock before returning from function
Upstream-commit: 7777c1be9bd5604014a0ac3f16e85960c4c0779a
Component: engine
2015-10-20 13:08:29 -04:00
7cf93e47cd validate the name of named volume
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
Upstream-commit: 609961ddcc835422e51ef4f3fd6088b96180f72f
Component: engine
2015-10-20 12:36:04 -04:00
db6db88cda Merge pull request #17035 from estesp/fix-build-dir-perms
Correct build-time directory creation with user namespaced daemon
Upstream-commit: ad861876e8bb86091527f31fc944205743e5ce85
Component: engine
2015-10-20 08:57:19 -07:00
47faea6d70 Merge pull request #17191 from mrjana/restart
Fix docker startup failure due to dangling endpoints
Upstream-commit: 566964bf73475e994ca605bd2106de045509d23f
Component: engine
2015-10-20 10:32:33 -04:00
9aebf5450b Correct build-time directory creation with user namespaced daemon
This fixes errors in ownership on directory creation during build that
can cause inaccessible files depending on the paths in the Dockerfile
and non-existing directories in the starting image.

Add tests for the mkdir variants in pkg/idtools

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: ae8c004dc18c59fec9cd67759a5e0087300e872d
Component: engine
2015-10-20 08:59:48 -04:00
e1c8600cf0 Fix docker startup failure due to dangling endpoints
Fixes docker startup failure due to dangling endpoints
which makes docker to not come up.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: 8adfc7e2d2d158a08096f60ff9318db5bb0875bd
Component: engine
2015-10-19 21:29:35 -07:00
e19e8cf7db Merge pull request #17187 from mavenugo/dopts
Fail the container start if the network has been removed
Upstream-commit: 48147d287b85975a8235c8d49a9e3cacce1a1534
Component: engine
2015-10-19 17:12:07 -07:00
e4a8ee278c Fail the container start if the network has been removed
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 8755920d0d1b3ef0d094bd75b25018b06d19839a
Component: engine
2015-10-19 15:00:07 -07:00
f6f1715608 devmapper: Drop devices lock before returning from function
cleanupDeleted() takes devices.Lock() but does not drop it if there are
no deleted devices. Hence docker deadlocks if one is using deferred
device deletion feature. (--storage-opt dm.use_deferred_deletion=true).

Fix it. Drop the lock before returning.

Also added a unit test case to make sure in future this can be easily
detected if somebody changes the function.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 2f16895ee94848e2d8ad72bc01968b4c88d84cb8
Component: engine
2015-10-19 17:51:17 -04:00
ae482ee1b1 Use more clear message for icc=false + iptables=false
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ab495ab0d0a340dc45ce283dd7e2de6110485156
Component: engine
2015-10-19 14:19:21 -07:00
b4f9b290d4 Merge pull request #17128 from calavera/network_controller_enabled
Do not initialize the networking routes when netController is not enabled.
Upstream-commit: 82a8a14c4d039579f80b640b5f815964e99db746
Component: engine
2015-10-19 16:13:31 -04:00
b8b4d2b3f7 Return 404 for all network operations without network controller.
This will prevent the api from trying to serve network requests in
systems where libnetwork is not enabled, returning 404 responses in any
case.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: eb982e7c00192c8306f9c420fb469f087c7b161d
Component: engine
2015-10-19 14:40:18 -04:00
372d5d880d Return empty Config fields, now omitempty, for API < 1.21
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 850bc0838a509d220bc78e47aa8203420aca22eb
Component: engine
2015-10-19 19:09:36 +02:00
ab68eef7dd refactor access to daemon member EventsService
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 2abf5d986ec6779555ea615763d3ffccede6121a
Component: engine
2015-10-19 09:41:29 -07:00
f37af18747 Merge pull request #17115 from mountkin/tag-on-build
Proposal: emit a "tag" event when building image with "-t" parameter
Upstream-commit: e62fd33d963cdba947a9ef5abe100a9d85c58f24
Component: engine
2015-10-19 12:35:58 -04:00
12d92cfae8 emit a "tag" event when building image with "-t" parameter
This is useful for cluster systems such as swarm to sync the image
state when new images are successfully built.

Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 2968fa44eb2a53c121ad2b27c519ae47ca7653c3
Component: engine
2015-10-19 20:09:14 +08:00
f246159061 Merge pull request #17046 from mavenugo/dopts
driver-opts for network create
Upstream-commit: 365a0db0f0f105306a8553405fb68a207e8d7754
Component: engine
2015-10-16 15:23:59 -07:00
fb40faa2f7 Merge pull request #16994 from Microsoft/10662-copied
Windows: Fix annoying bad log
Upstream-commit: 8c1fa7f32028c7c2a631317b7b3112ca9a78cd19
Component: engine
2015-10-16 15:14:08 -07:00
08be0c3eb3 Pass network driver option in docker network command
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 6f3eb994b52dac9e336db9fe9f204e120553e8a7
Component: engine
2015-10-16 14:33:54 -07:00
a02e30a7f6 Merge pull request #17087 from LK4D4/speedup_ps
Speedup container list
Upstream-commit: dee57e4c3ec8b86ffb2958528fc81f981f85f730
Component: engine
2015-10-16 12:35:28 +02:00
74b88c7e5c Speedup container list
Remove all unneeded disk operations (reload TagStore, umarshal image)
for checking if image still points to same ID. Now slowest part is
queries to sqlite which hopefuly will be removed soon.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f256d8ad2d1fbd9407d2b7a8eb69c96665c4015e
Component: engine
2015-10-15 20:41:35 -07:00
30e90c5ea6 Merge pull request #16997 from Microsoft/10662-kill-parttwo
Windows: [TP4] docker kill handling part two
Upstream-commit: e1804098b9c9ebb6210af29045198bd5259bb834
Component: engine
2015-10-15 14:42:19 -07:00
9be0d4300b Merge pull request #16968 from MHBauer/network-refactor
refactor use of container struct from daemon
Upstream-commit: aaa8cae34537eb9bddacacc8bce61c91ca76d7d2
Component: engine
2015-10-14 17:48:08 +02:00
5ff41583d8 Better error when --host=ipc but no /dev/mqueue
Signed-off-by: Burke Libbey <burke.libbey@shopify.com>
Upstream-commit: fd955ce6ca7c8659d76de5dc397b307a3a22e2c4
Component: engine
2015-10-14 10:52:16 -04:00
177d0dd24f Revert "Fix --ipc=host dependency on /dev/mqueue existing"
This reverts commit f624d6187a8daa3ca0999c46cb345f8db6f330e7.

Signed-off-by: Burke Libbey <burke.libbey@shopify.com>
Upstream-commit: ab7923558d61caccafd08aee667e7fc44a80164e
Component: engine
2015-10-14 10:52:04 -04:00
182a4806ba refactor use of container struct from daemon
- do existence check instead of get container
 - new connect method on daemon.
 - cli network disconnect integration test

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: a0398fbd197b5c4cf261b702ba1a1f924d6134e8
Component: engine
2015-10-13 16:34:28 -07:00
803f14d503 Windows: [TP4] docker kill handling
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: bc503ca8ab2303066cc64d752ffff05100a9b267
Component: engine
2015-10-13 16:04:49 -07:00
00315a1cac Windows: Fix annoying bad log
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 69949df2420afcf0677d8ecb2ecc93a08e716619
Component: engine
2015-10-13 15:03:20 -07:00
50f40c819d daemon: execdriver: lxc: fix cgroup paths
When running LXC dind (outer docker is started with native driver)
cgroup paths point to `/docker/CID` inside `/proc/self/mountinfo` but
these paths aren't mounted (root is wrong). This fix just discard the
cgroup dir from mountinfo and set it to root `/`.
This patch fixes/skip OOM LXC tests that were failing.
Fix #16520

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: cfcddefacd125af4d909df653bccc8e3089a03b0
Component: engine
2015-10-13 14:46:59 -07:00
1a998995c2 daemon: execdriver: lxc: fix set memory swap
On LXC memory swap was only set to memory_limit*2 even if a value for
memory swap was provided. This patch fix this behavior to be the same
as the native driver and set correct memory swap in the template.
Also add a test specifically for LXC but w/o adding a new test
requirement.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 06f0d03cede5f6cdaca87f6b786555b023d5286f
Component: engine
2015-10-13 14:46:59 -07:00
c77d193921 Fix --ipc=host dependency on /dev/mqueue existing
Since #15862, containers fail to start when started with --ipc=host if
/dev/mqueue is not present. This change causes docker to create
container-local mounts for --ipc=host containers as well as in the
default case.

Signed-off-by: Burke Libbey <burke.libbey@shopify.com>
Upstream-commit: f624d6187a8daa3ca0999c46cb345f8db6f330e7
Component: engine
2015-10-13 17:46:55 -04:00