f4cf808a3d
Merge branch 'master' into api
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Conflicts:
MAINTAINERS
cgroups/cgroups.go
cgroups/fs/apply_raw.go
cgroups/fs/notify_linux.go
cgroups/fs/notify_linux_test.go
cgroups/systemd/apply_systemd.go
config.go
configs/config_test.go
console/console.go
integration/exec_test.go
integration/init_test.go
integration/template_test.go
integration/utils_test.go
linux_notify.go
linux_notify_test.go
mount/init.go
mount/mount_config.go
mount/pivotroot.go
mount/ptmx.go
namespaces/create.go
namespaces/exec.go
namespaces/execin.go
namespaces/init.go
namespaces/nsenter/nsenter.c
namespaces/nsenter/nsenter.go
namespaces/utils.go
network/network.go
network/types.go
network/veth.go
notify_linux.go
notify_linux_test.go
nsinit/exec.go
nsinit/main.go
nsinit/nsenter.go
nsinit/oom.go
sample_configs/host-pid.json
sample_configs/userns.json
security/capabilities/capabilities.go
update-vendor.sh
2015-02-16 15:09:42 -08:00
55d61e22c5
Merge pull request #381 from crosbymichael/configfactory
...
Add functional API for Factory configuration
2015-02-16 11:44:47 -08:00
b21b19e060
Add factory configuration via functional api
...
This allows you to set certian configuration options such as what cgroup
implementation to use on the factory at create time.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-16 11:26:13 -08:00
4c43b0f498
Add mutex around stateful container operations
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-16 09:59:02 -08:00
2b45128091
Merge pull request #379 from mrunalp/userns_config_gen
...
Add config generation for simple user namespace testing.
2015-02-13 17:20:30 -08:00
cacc15360e
Add config generation for simple user namespace testing.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-02-13 20:17:16 -05:00
8002fd2263
Merge pull request #378 from mrunalp/cleanup_comments
...
Fixed some typos and tried to make comments read better.
2015-02-13 16:18:57 -08:00
a1d509759b
Fixed some typos and tried to make comments read better.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-02-13 19:06:17 -05:00
2990f254f0
Merge pull request #377 from mrunalp/console_path
...
Add a constant for the container console path.
2015-02-13 15:24:44 -08:00
77085907a4
Add a constant for the container console path.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-02-13 18:23:17 -05:00
3f35b26b8b
Merge pull request #373 from LK4D4/netlink_hairpin_support
...
Use netlink to set hairpin mode
2015-02-13 14:08:28 -08:00
29f5cb6b39
Add systemd support cpu.cfs_quota_us and cpu.cfs_period_us
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-02-13 14:33:03 +08:00
031524c73d
Merge pull request #375 from crosbymichael/move-system-mounts
...
Refactor system mounts to be placed on the config
2015-02-12 21:36:03 -08:00
ebefcddc3c
Use netlink to set hairpin mode
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-12 18:40:54 -08:00
1a37242fa2
Refactor system mounts to be placed on the config
...
Also remove the RestrictSys bool replaced by configurable paths that the
user can specify.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-12 16:58:38 -08:00
a9a503082e
Merge pull request #374 from LK4D4/go1.3_support
...
Fix compilation with golang 1.3(uid/gid mappings is unsupported)
2015-02-12 14:21:41 -08:00
fe9f766895
Fix compilation with golang 1.3(uid/gid mappings is unsupported)
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-12 13:28:07 -08:00
cee97cb0cc
Merge pull request #372 from rhatdan/gcc5.0
...
Changes required to keep gcc 5.0 quiet and happy.
2015-02-12 11:42:14 -08:00
6262667787
Changes required to keep gcc 5.0 quiet
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-02-12 14:21:34 -05:00
e2ed997ae5
Merge pull request #370 from crosbymichael/state
...
Ensure state is persisted
2015-02-12 11:19:58 -08:00
c2403c32db
Add GetPath on namespace config
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-12 10:38:43 -08:00
91a3f162af
Implement nsinit state command
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 18:49:28 -08:00
5df859ad24
Add config command to nsinit
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 17:26:29 -08:00
d909440c48
Unexport certain internal funcs and types
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 17:12:03 -08:00
5c246d038f
Persist container state to disk
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 16:52:28 -08:00
31327166e5
Rename OOM to NotifyOOM
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 15:09:54 -08:00
7fff13632e
Add state method to return container's runtime state
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 14:45:07 -08:00
9f0cca11d0
Merge pull request #367 from crosbymichael/validation
...
API Refactoring
2015-02-11 13:47:45 -08:00
fde0b7aa0d
Refactor network and veth creation
...
Remove veth interfaces on the host if an error occurs.
Provide the host interface name, temporary peer interface name and the
name of the peer once it is inside the container's namespace in the
Network config.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 13:33:58 -08:00
2ec6b585ea
Add new API examples to readme
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:27 -08:00
758d151e61
Fully remove security package
...
This moves the capabilities package into the root package.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:09 -08:00
ad49d71504
Remove network package
...
Also add ability to get network stats from multiple interfaces.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:09 -08:00
6a04779b41
Remove restrict package
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:09 -08:00
1c895b409a
Move mount logic into root package
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:09 -08:00
b0e274c0d2
Remove console package and add Console type
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:09 -08:00
20daff5e2c
Move mount package into libcontainer root
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:09 -08:00
1edada52fd
Move Cwd and User to Process
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:09 -08:00
9dcbc4f3f8
Implement container signaling
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:09 -08:00
0c1919c427
Refactor parent processes into types
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:09 -08:00
21bb5ccc4f
Move environment configuration to Process
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:09 -08:00
58023ad32f
Add parent death signal to the container config
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:09 -08:00
8850636eb3
Refactor init actions into separate types
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:08 -08:00
5fc19e8db5
Rename Fs fields to fs
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-11 11:20:08 -08:00
e48806d39d
Merge pull request #360 from avagin/api-userns-test
...
integration: check a container with userns
2015-02-10 17:14:47 -08:00
21ed4766b1
Merge pull request #366 from icecrime/hairpin-nat
...
Resurrect hairpin NAT
2015-02-10 15:35:43 -08:00
190e50b08d
Selectively enable hairpin NAT
...
Offer the ability to enable hairpin NAT on a per network basis, while
keeping it disable by default as it is unsupported by older kernel.
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-02-10 15:30:36 -08:00
d6fae7bb26
Merge pull request #369 from dqminh/exec-reap-zombie
...
handle SIGCHLD when running as child subreaper
2015-02-10 11:11:07 -08:00
770e258390
handle SIGCHLD when running as child subreaper
...
When running under child subreaper mode, it's useful for nsenter to be able to
reap child processes. We have seen cases where spawned user processes wasnt
reaped properly (https://github.com/creationix/nvm/issues/650 )
Signed-off-by: Daniel, Dao Quang Minh <dqminh89@gmail.com>
2015-02-10 04:50:22 -05:00
da109f3af0
enable hairpin mode on virtual interface bridge port
...
This is to support being able to DNAT/MASQ traffic from a container back into itself (dotcloud/docker#4442 )
Docker-DCO-1.1-Signed-off-by: Patrick Hemmer <patrick.hemmer@gmail.com> (github: phemmer)
2015-02-09 14:56:27 -08:00
da32455210
Merge pull request #343 from dqminh/dqminh
...
add dqminh as maintainer
2015-02-09 12:11:06 -08:00
Michael Crosby
Michael Crosby
Victor Marmol
Mrunal Patel
Lei Jitang
Alexander Morozov
Mrunal Patel
Dan Walsh
Arnaud Porterie
Daniel, Dao Quang Minh
Patrick Hemmer