c32f8bb36a
Merge pull request #17704 from LK4D4/default_cgroupfs
...
Use fs cgroups by default
2015-11-19 14:01:13 +01:00
419fd7449f
Use fs cgroups by default
...
Our implementation of systemd cgroups is mixture of systemd api and
plain filesystem api. It's hard to keep it up to date with systemd and
it already contains some nasty bugs with new versions. Ideally it should
be replaced with some daemon flag which will allow to set parent systemd
slice.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-18 16:16:13 -08:00
9187656305
Merge pull request #16639 from mrunalp/skip_dev_setup
...
Skip /dev setup in container when it is bind mounted in
2015-11-17 11:36:00 -08:00
6f1bc096a6
Merge pull request #18025 from Microsoft/10662-ArgumentEscaping
...
Windows: Fix docker exec
2015-11-17 11:14:54 +01:00
d7692b02bd
Typo in previous PR processConfig, not c.ProcessConfig
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2015-11-16 11:56:01 -08:00
ad8a66573c
Merge pull request #17851 from Microsoft/10662-ArgumentEscaping
...
Prevent double escaping of Dockerfile commands on Windows
2015-11-14 17:25:53 +01:00
9db5db1b94
This fixes the case where arguments are escaped twice from Dockerfiles on
...
Windows
Signed-off-by: Darren Stahl <darst@microsoft.com>
2015-11-13 10:43:06 -08:00
588fedef4a
Merge pull request #17949 from Microsoft/jjh/cpuweighttp4
...
Windows: TP4 fix cpu weight
2015-11-12 21:13:09 +01:00
812a1c149a
Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
...
Add support for blkio.weight_device
2015-11-12 20:42:13 +01:00
90eac6b48b
Windows: TP4 fix cpu weight
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-12 11:08:24 -08:00
8cf38b6a8b
Merge pull request #17589 from Microsoft/jjh/refactorprocessconfig
...
Refactor ProcessConfig
2015-11-12 07:28:32 -08:00
0fbfa1449d
Add support for blkio.weight_device
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-11-11 23:06:36 +08:00
d4c4557b1a
Merge pull request #17613 from Microsoft/10662-isolationexecopt
...
Windows: Add default isolation exec driver option
2015-11-10 19:55:46 +00:00
a429ad1e35
Windows: Add default isolation exec driver option
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-10 11:39:05 -08:00
58b270c338
Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again
...
Another try at dockerversion placeholder for library import
2015-11-09 13:15:50 -08:00
8054a30387
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>
2015-11-09 19:32:46 +01:00
5fa2e4d4f2
Refactor ProcessConfig
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-09 09:51:09 -08:00
77af7d1067
Refactor exitStatus structure
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-09 08:26:35 -08:00
342e6bb99f
Merge pull request #17581 from Microsoft/10662-factoroutexecuser
...
Windows: Factor out user in execdriver\driver
2015-11-07 22:11:26 -05:00
b10dd17e06
Don't build utils on Windows
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-07 08:46:36 -08:00
ad55d29c91
Merge pull request #17575 from Microsoft/10662-nativetemplate
...
Windows: Fix native exec template
2015-11-06 16:14:44 -08:00
00d00b429f
Remove LxcConf in daemon_test.go and fix a typo
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-11-06 09:58:06 +08:00
157b66ad39
Remove exec-driver global daemon option.
...
Each platform has only a driver now.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-05 17:09:58 -05:00
3b5fac462d
Remove LXC support.
...
The LXC driver was deprecated in Docker 1.8.
Following the deprecation rules, we can remove a deprecated feature
after two major releases. LXC won't be supported anymore starting on Docker 1.10.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-11-05 17:09:57 -05:00
910e4ba7ed
Windows: Factor out user in execdriver\driver
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 19:19:24 -07:00
be2f53ece8
Windows: Fix native exec template
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 11:39:19 -07:00
4468e1e74e
Merge pull request #17567 from Microsoft/10662-lxcunittest
...
Windows: Fix go test in execdriver\lxc
2015-10-31 09:40:19 -07:00
30ab497e17
Windows: Fix go test in execdriver\lxc
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-31 08:25:36 -07:00
9d14866d71
Windows: Refactor execdriver.Command
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-30 13:53:00 -07:00
15e35c4470
Windows: Adds support for Hyper-V Containers
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-29 16:18:52 -07:00
b78ca243d9
Revert "dockerversion placeholder for library-import"
...
This reverts commit d5cd032a86
2015-10-27 21:23:53 -04:00
6276c676a8
Merge pull request #17350 from vdemeester/11699-auto-libraryimport
...
dockerversion placeholder for library-import
2015-10-27 13:39:40 -07:00
d5cd032a86
dockerversion placeholder for library-import
...
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-27 20:36:07 +01:00
fe1e04a84f
Merge pull request #17285 from Microsoft/10662-exectp4workaround
...
Windows [TP4] Trap Hyper-V exec failure
2015-10-26 16:47:51 -07:00
b1220a763c
Windows: Refactor resources structure
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-26 13:48:16 -07:00
5087e8c2e8
Merge pull request #17180 from rhatdan/destroy
...
Docker is calling cont.Destroy twice on success
2015-10-26 15:48:04 -04:00
2e56e78caf
Windows [TP4] Trap Exec Hyper-V Cont error
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-23 08:42:24 -07:00
a7e686a779
Windows: Add volume support
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-22 10:42:53 -07:00
0c518b6ab2
Docker is calling cont.Destroy twice on success
...
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-10-19 14:53:55 -04:00
8c1fa7f320
Merge pull request #16994 from Microsoft/10662-copied
...
Windows: Fix annoying bad log
2015-10-16 15:14:08 -07:00
e1804098b9
Merge pull request #16997 from Microsoft/10662-kill-parttwo
...
Windows: [TP4] docker kill handling part two
2015-10-15 14:42:19 -07:00
bc503ca8ab
Windows: [TP4] docker kill handling
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-13 16:04:49 -07:00
69949df242
Windows: Fix annoying bad log
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-13 15:03:20 -07:00
cfcddefacd
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>
2015-10-13 14:46:59 -07:00
06f0d03ced
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>
2015-10-13 14:46:59 -07:00
442b45628e
Add user namespace (mapping) support to the Docker engine
...
Adds support for the daemon to handle user namespace maps as a
per-daemon setting.
Support for handling uid/gid mapping is added to the builder,
archive/unarchive packages and functions, all graphdrivers (except
Windows), and the test suite is updated to handle user namespace daemon
rootgraph changes.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-09 17:47:37 -04:00
a1620084c5
remove useless function generateIfaceName()
...
generateIfaceName() is useless as libnetwork has done
the job.
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com>
2015-10-09 18:07:54 +08:00
5ec323aaa2
Merge pull request #16660 from Microsoft/js/hostname
...
Windows: --hostname support
2015-10-08 16:11:49 -04:00
7539013436
bump libcontainer to 902c012e85cdae6bb68d8c7a0df69a42f818ce96
...
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
2015-10-06 17:55:09 +02:00
7e8c92ad72
Windows: --hostname support
...
This passes through the container hostname to HCS, which in Windows Server
2016 TP4 will set the container's hostname in the registry before starting
it. This will be silently ignored by TP3.
Signed-off-by: John Starks <jostarks@microsoft.com>
2015-09-29 12:13:06 -07:00
Vincent Demeester
Alexander Morozov
Alexander Morozov
David Calavera
Darren Stahl
Antonio Murdaca
John Howard
Ma Shimiao
Sebastiaan van Stijn
Vincent Demeester
Brian Goff
Lei Jitang
Dan Walsh
Antonio Murdaca
Phil Estes
Deng Guangxing
Antonio Murdaca
John Starks