Commit Graph

2674 Commits

Author SHA1 Message Date
1a8e0677b9 Merge pull request #17417 from cpuguy83/15815_add_log_file_poller
Fallback to file polling for jsonlog reader on err
Upstream-commit: 42fa8e31284c76f485bed81ed2e1327d60e5cb13
Component: engine
2015-11-13 11:49:54 -08:00
f06cbc085f This fixes the case where arguments are escaped twice from Dockerfiles on
Windows

Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 9db5db1b94bc1000d151315851096dcc6cd3512d
Component: engine
2015-11-13 10:43:06 -08:00
e628862038 Merge pull request #16873 from coolljt0725/expand_docker_info
Add more cgroup config to docker info
Upstream-commit: cccf6749431b5055e01f824f1d479ab517e1f812
Component: engine
2015-11-13 09:37:06 -08:00
ec49c2f481 Rename daemon/utils_*.go to selinux
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: f9daecc880f371cf652fd64095d65f0fe35fb2f7
Component: engine
2015-11-12 15:48:41 -08:00
32490eabee Merge pull request #17949 from Microsoft/jjh/cpuweighttp4
Windows: TP4 fix cpu weight
Upstream-commit: 588fedef4af1550f631a71ef1bd98998bc031613
Component: engine
2015-11-12 21:13:09 +01:00
442b6c9f86 Merge pull request #17948 from LK4D4/splunk_windows
Enable Splunk logdriver for windows
Upstream-commit: 318a13b0afbfe652c7b6de660caa6bbbf884e95d
Component: engine
2015-11-12 20:44:31 +01:00
c0d8796b26 Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
Add support for blkio.weight_device
Upstream-commit: 812a1c149a4a6db09eb59af29bed2713821e696e
Component: engine
2015-11-12 20:42:13 +01:00
95bf21f468 Windows: TP4 fix cpu weight
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 90eac6b48baac2b74b4721456fee4b3f2a0527b8
Component: engine
2015-11-12 11:08:24 -08:00
95e4808678 Enable Splunk logdriver for windows
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 705b50850c47e44d82fb40b7f86ddb56a43c20f4
Component: engine
2015-11-12 10:57:21 -08:00
971f161db1 Cap the amount of buffering done by BytesPipe
Turn BytesPipe's Read and Write functions into blocking, goroutine-safe
functions. Add a CloseWithError function to propagate an error code to
the Read function.

Adjust tests to work with the blocking Read and Write functions.

Remove BufReader, since now its users can use BytesPipe directly.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
Upstream-commit: 64f8ee444d23ae29a236f169f1d7faf7042b524a
Component: engine
2015-11-12 10:11:29 -08:00
c1e130b932 Merge pull request #17589 from Microsoft/jjh/refactorprocessconfig
Refactor ProcessConfig
Upstream-commit: 8cf38b6a8b031bd0d39d80d0a1d1b6e860a43acb
Component: engine
2015-11-12 07:28:32 -08:00
bba768bb09 Allow configurable metadata for Splunk log driver
Add support of `tag`, `env` and `labels` for Splunk logging driver.
Removed from message `containerId` as it is the same as `tag`.

Signed-off-by: Denis Gladkikh <denis@gladkikh.email>
Upstream-commit: 26855c780184c528446957bd77821c6f4c74b343
Component: engine
2015-11-12 06:36:51 -08:00
2552a392d2 daemon/kill.go: simplify if statement
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: fa7ec908c493161892ebdd7c51b440367f527805
Component: engine
2015-11-11 17:19:39 -08:00
bc3ac4cb1c Merge pull request #17919 from Microsoft/jjh/tp4
Windows [TP4] Require build 10586+
Upstream-commit: 87de5fdd5972343a11847922e0f41d9898b5cff7
Component: engine
2015-11-11 19:36:13 -05:00
53e497ffae Merge pull request #17916 from Microsoft/jjh/fix-cp-with-volumes
Windows [TP4] Fix docker cp when volumes
Upstream-commit: 5b046c71d8ab944ad88baf9f92ae6b3b78a28cdd
Component: engine
2015-11-11 19:35:05 -05:00
a3794d804f Windows [TP4] Require build 10586+
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 122568b31465127537197cf6d9575b00bdd02045
Component: engine
2015-11-11 14:49:14 -08:00
470099dd9c Merge pull request #17894 from mqliang/deferMove
move defer statement for readability
Upstream-commit: 6c82fba2b32781e6cef4fda71e7b35c3dcdcb9da
Component: engine
2015-11-11 14:03:48 -08:00
d8d32d2bbf Windows [TP4] Fix docker cp when volumes
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 3a852d8442f31651f0e776430432e5dda44455e0
Component: engine
2015-11-11 14:02:07 -08:00
7a892cd97a Merge pull request #17903 from rhvgoyal/default-to-xfs-v2
Devicemapper: Default to xfs instead of ext4
Upstream-commit: adb14543fd2a550a3b9a8cb12637e376cd398be4
Component: engine
2015-11-11 16:42:58 -05:00
940947b2d3 Merge pull request #17909 from LK4D4/info_simple
daemon/info.go: assign proxy fields directly
Upstream-commit: 37dfae3cde79966734c72a57ed2b2d4c653d61b6
Component: engine
2015-11-11 21:15:13 +01:00
c077545d83 Relabel BTRFS Content on container Creation
This change will allow us to run SELinux in a container with
BTRFS back end.  We continue to work on fixing the kernel/BTRFS
but this change will allow SELinux Security separation on BTRFS.

It basically relabels the content on container creation.

Just relabling -init directory in BTRFS use case. Everything looks like it
works. I don't believe tar/achive stores the SELinux labels, so we are good
as far as docker commit.

Tested Speed on startup with BTRFS on top of loopback directory. BTRFS
not on loopback should get even better perfomance on startup time.  The
more inodes inside of the container image will increase the relabel time.

This patch will give people who care more about security the option of
runnin BTRFS with SELinux.  Those who don't want to take the slow down
can disable SELinux either in individual containers or for all containers
by continuing to disable SELinux in the daemon.

Without relabel:

> time docker run --security-opt label:disable fedora echo test
test

real    0m0.918s
user    0m0.009s
sys    0m0.026s

With Relabel

test

real    0m1.942s
user    0m0.007s
sys    0m0.030s

Signed-off-by: Dan Walsh <dwalsh@redhat.com>

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: 1716d497a420f0cd4e53a99535704c6d215e38c7
Component: engine
2015-11-11 14:49:27 -05:00
724166c497 daemon/info.go: assign proxy fields directly
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1df0bb5a1309af0402d83061d4404afe7396e657
Component: engine
2015-11-11 11:03:53 -08:00
202ace0de5 Merge pull request #17858 from sanimej/libn
Allow port mapping only for endpoint created on docker run
Upstream-commit: 0b566566c66832ea7d78b6468fb960dd2d4975f9
Component: engine
2015-11-11 11:00:31 -08:00
82cddf7c00 Merge pull request #17193 from cpuguy83/refactor_store_errors
Refactor volume store's error usage
Upstream-commit: 2bb1c530d7e0f20b5822cbff7656c4e0a7cd4930
Component: engine
2015-11-11 10:25:00 -08:00
4fe87618a6 Merge pull request #17890 from aboch/b6
Restore deterministic IPv6 from MAC behavior on default bridge network
Upstream-commit: 7a985cfafc211c8cc302e4c1e14059fc513663ba
Component: engine
2015-11-11 12:42:08 -05:00
abd797dbbd devmapper: Switch to xfs as default filesystem if supported
If platform supports xfs filesystem then use xfs as default filesystem 
for container rootfs instead of ext4. Reason being that ext4 is pre-allcating
lot of metadata (around 1.8GB on 100G thin volume) and that can take long
enough on AWS storage that systemd times out and docker fails to start.

If one disables pre-allocation of ext4 metadata, then it will be allocated
when containers are mounted and we will have multiple copies of metadata
per container. For a 100G thin device, it was around 1.5GB of metadata
per container.

ext4 has an optimization to skip zeroing if discards are issued and
underlying device guarantees that zero will be returned when discarded
blocks are read back. devicemapper thin devices don't offer that guarantee
so ext4 optimization does not kick in. In fact given discards are optional
and can be dropped on the floor if need be, it looks like it might not be
possible to guarantee that all the blocks got discarded and if read back
zero will be returned.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 07ff17fb850e5ddae6f38cc21776ebb9b1690f3e
Component: engine
2015-11-11 12:07:35 -05:00
edb4695814 devmapper: Warn if user specified a filesytem and base device already has fs
If user wants to use a filesystem it can be specified using dm.fs=<filesystem>
option. It is possible that docker already had base image and a filesystem
on that. Later if user wants to change file system using dm.fs= option
and restarts docker, that's not possible. Warn user about it.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 83a34e000b2332d9a1b4214a77fae021ed144acb
Component: engine
2015-11-11 12:07:35 -05:00
621ef05af0 Restore IPv6 from MAC on default bridge network
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 095a8ac5451de25a91fc569a6633fdd8d4cabb3f
Component: engine
2015-11-11 08:36:04 -08:00
1a0735060a Add support for blkio.weight_device
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 0fbfa1449d917ee0778266139d6035fb0782f7c2
Component: engine
2015-11-11 23:06:36 +08:00
199c5fdeef Merge pull request #16774 from tonistiigi/15643-aufs-plnk
Copy aufs hardlinks to top layer
Upstream-commit: 10667253951a783785d3236192428a5decca3fef
Component: engine
2015-11-11 07:59:41 +01:00
7aea45d5d0 move defer statement for readability
Signed-off-by: mqliang <mqliang.zju@gmail.com>
Upstream-commit: d71eeb1c057cdb7ffdb0b5a2aac537671578b676
Component: engine
2015-11-11 11:28:23 +08:00
cb403bcf07 Refactor volume store's error usage
Uses an errors API similar the `net` package.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 43012fe8425650930a21703d9468ab0e777e053a
Component: engine
2015-11-10 20:33:29 -05:00
2d895b215b Merge pull request #17874 from LK4D4/nocheck_nil_map
daemon/info.go: remove check for map nilness
Upstream-commit: 5b718bdee288134e9a0cfc12d0ed655a3858747f
Component: engine
2015-11-10 12:52:52 -08:00
37b87b6310 Merge pull request #17613 from Microsoft/10662-isolationexecopt
Windows: Add default isolation exec driver option
Upstream-commit: d4c4557b1af794c4d7e4a9833b20119c0a4c091c
Component: engine
2015-11-10 19:55:46 +00:00
328de5870b Windows: Add default isolation exec driver option
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: a429ad1e35691fb01f3f80461964030d2197a0eb
Component: engine
2015-11-10 11:39:05 -08:00
eed9f30045 Merge pull request #17476 from coolljt0725/prevent_connect_to_host
Fix connect to host and prevent disconnect from host for host network
Upstream-commit: 470fc94f3856640d1c85c90c62a78396a4d55d66
Component: engine
2015-11-10 09:48:33 -08:00
015026bb0d daemon/info.go: remove check for map nilness
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 8f311f4d8c80fc33613a0f4ddf723ef1e11b1b17
Component: engine
2015-11-10 09:20:59 -08:00
dd6061632b Show warning when user specify dm.basesize for already initialized devicemapper drive
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: e035d272232890cd01b5eabc1081041032affdc0
Component: engine
2015-11-10 14:50:19 +08:00
b05f4e5488 Merge pull request #17843 from LK4D4/discovery_refactor
Refactoring in daemon/discovery.go
Upstream-commit: 6f2c6111d42f823142fc26bc519417b82ffed56b
Component: engine
2015-11-10 07:34:11 +01:00
9a5f43818f Merge pull request #17847 from LK4D4/exec_unnec_var
Remove unnecessary var block in monitorExec
Upstream-commit: 70579bd558e08fc88c06d8925e0be288692d1eac
Component: engine
2015-11-09 23:32:38 -06:00
f078761369 remove the unused DefaultNetwork member from daemon.Config
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 76992f3e230458eb3d48678321cef5b54e3374c9
Component: engine
2015-11-10 09:51:15 +08:00
df0ccc7d18 Refactoring in daemon/discovery.go
Replace time.Sleep with time.Tick and remove unnecessary var block.
Use Warn log-level instead of error.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: d83b5dc1773a1e4e5f35cebf1625435a3f1a1c60
Component: engine
2015-11-09 15:21:27 -08:00
3ba5945bba Remove unnecessary var block in monitorExec
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 445675e8081ae1e911db2ebd57efd51329574cdf
Component: engine
2015-11-09 15:14:20 -08:00
c53c22b70c Merge pull request #17779 from calavera/fix_dns_regression
Use an empty slice as default value for DNS, DNSSearch and DNSOptions.
Upstream-commit: 62b484411e851542cdc05ef36fb287c2245ec70c
Component: engine
2015-11-09 18:07:07 -05:00
7523555ae3 Merge pull request #17450 from rhatdan/selinux
Fix relabel for SELinux
Upstream-commit: 143f3579b0553b50b03438aef76d908a5d327863
Component: engine
2015-11-09 13:19:28 -08:00
2f262fa249 Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again
Another try at dockerversion placeholder for library import
Upstream-commit: 58b270c338e831ac6668a29788c72d202f9fc251
Component: engine
2015-11-09 13:15:50 -08:00
21f4b9fc72 Fix relabel for SELinux
With the changes merged into runc/libcontainer, are now causing
SELinux to attempt a relabel always, even if the user did not
request the relabel.

If the user does not specify Z or z on the volume mount we should
not attempt a relabel.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
Upstream-commit: d9011b36176d6245bdc25401633c213d73e14ea0
Component: engine
2015-11-09 14:04:57 -05:00
48001c30bb dockerversion placeholder for library import
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 8054a303870b81eebe05e38261c1b68197b68558
Component: engine
2015-11-09 19:32:46 +01:00
97bbd407aa Refactor ProcessConfig
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 5fa2e4d4f2be7787ad29b1e6ffd9c026ea0c1925
Component: engine
2015-11-09 09:51:09 -08:00
0345dce058 Use an empty slice as default value for DNS, DNSSearch and DNSOptions
So we don't print those <no value> in the client and we don't fail
executing inspect templates with API field names.

Make sure those fields are initialized as empty slices when
a container is loaded from disk and their values are nil.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: f1a74a89f89affcfbe311e89aa752b3d551e0340
Component: engine
2015-11-09 12:46:48 -05:00