f9590b0927
Adds missing exit to fatal function.
...
Extracts ProcessState when we get ExitError.
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-02-25 13:54:45 -05:00
286fffa4ee
Merge pull request #405 from LK4D4/add_default_init
...
Add default InitArgs for factory
2015-02-25 09:20:35 -08:00
8600e6f315
Add default InitArgs for factory
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-25 09:11:39 -08:00
c96cde4e5d
Merge pull request #404 from crosbymichael/init-path
...
Add init path support to allow full control of init binary
2015-02-24 18:53:16 -08:00
e7953c3609
Merge pull request #403 from LK4D4/config_methods_on_values
...
Make possible to call config methods on values
2015-02-24 18:41:19 -08:00
a36d471a0e
Add init path support to allow full control of init binary
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-24 17:53:11 -08:00
dc34fe1883
Merge pull request #402 from LK4D4/fix_start_comment
...
Fix comment for container.Start
2015-02-24 16:20:19 -08:00
ec005e73b9
Make possible to call config methods on values
...
Because container.Config() returns values and you can't get pointer from
function call immediately. So it is impossible to call
container.Config().HostUID().
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-24 16:06:53 -08:00
b4cda7a6ca
Fix comment for container.Start
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-24 15:09:43 -08:00
9d4f6b3d3d
Merge pull request #401 from jfrazelle/remove-drone
...
remove drone
2015-02-24 15:09:25 -08:00
fb27b4238c
remove drone
...
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
2015-02-24 15:11:47 -08:00
54301f5593
Merge pull request #383 from rhatdan/audit_read
...
Linux has added a new capability audit_read
2015-02-24 13:44:02 -08:00
c504f85aab
Merge pull request #397 from LK4D4/use_const_ns
...
Use configs.NamespaceType as key for State.NamespacePathes
2015-02-24 12:46:06 -08:00
bdff595cad
Use configs.NamespaceType as key for State.NamespacePathes
...
I think this is more convenient because for working with namespaces we
using configs.NamespaceType.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-24 11:54:58 -08:00
5b2be7d9d8
Update to latest gocapability package
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-02-24 13:03:38 -05:00
00abcf89d9
Linux has added a new capability audit_read
...
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
2015-02-24 08:09:32 -05:00
edb31ce0a6
Merge pull request #391 from thaJeztah/update-copyright-year-in-notice
...
Update copyright year in NOTICE
2015-02-23 14:04:47 -08:00
83add60f21
Merge pull request #392 from avagin/api-wait
...
process: add Wait() and Pid() methods
2015-02-23 13:51:37 -08:00
f8eb40433c
Add a validate script so we can validate.
...
For easy validations.
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <hugs@docker.com> (github: jfrazelle)
2015-02-23 12:53:49 -08:00
94fb37f557
process: add Wait(), Signal() and Pid() methods
...
Currently we have a problem when buffers are used for std file
descriptors. These buffers are filled from goroutines (Cmd.goroutine),
and we need to wait them to be sure that all data have been copied.
Signed-off-by: Andrew Vagin <avagin@openvz.org>
2015-02-23 23:40:41 +03:00
d1ae7cd673
Merge pull request #394 from LK4D4/naming_fix
...
Change os-prefix file naming to standard postfix naming
2015-02-23 10:47:19 -08:00
a1c3e0db94
Change os-prefix file naming to standard postfix naming
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-23 10:41:26 -08:00
d64cfe5c05
Merge pull request #390 from vbatts/vbatts-gccgo_constructor
...
nsenter: noop reference to C constructor
2015-02-23 09:28:14 -08:00
8da9c6878f
Update copyright year in NOTICE
...
Spotted this one when creating https://github.com/docker/docker/pull/10938
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-02-22 21:00:23 +01:00
699429e60f
nsenter: noop reference to C constructor
...
https://gcc.gnu.org/bugzilla/show_bug.cgi?id=65134
Workaround suggested by iant
Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
2015-02-21 09:56:46 -05:00
5b73860e65
Merge pull request #388 from docker/api
...
Merge API Branch into Master
2015-02-19 16:30:01 -08:00
7eceabd47f
Merge pull request #389 from crosbymichael/mergeapi
...
Merge master into api
2015-02-19 16:08:09 -08:00
22df5551ed
Merge branch 'master' into api
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Conflicts:
cgroups/systemd/apply_systemd.go
2015-02-19 16:02:50 -08:00
1b755bf962
Merge pull request #386 from mrunalp/userns_check
...
Validation for user namespace in the config.
2015-02-19 09:16:13 -08:00
8c3b6b1868
Merge pull request #387 from mrunalp/rootfs_config
...
Fixes bug where rootfs was empty instead of pwd when not specified.
2015-02-19 08:27:22 -08:00
f34b3b765f
Validation for User Namespaces in the config.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-02-18 23:14:01 -08:00
4d863b7bd0
Fixes bug where rootfs was empty instead of pwd when not specified.
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2015-02-18 21:36:04 -08:00
d06a2dab9f
Merge pull request #385 from crosbymichael/userns-updates
...
Make usernamespaces work without sidecar process
2015-02-18 16:20:49 -08:00
afa8443118
Remove userns sidecar process
...
Move the network setup back into the standard init even for user
namespaces now that mounts are fully supported and working.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-18 15:47:26 -08:00
339edce03e
Update console and mount handling for user namespaces
...
This updates the console handling to chown the console on creation to
the root user within the container.
This also moves the setup mounts from the userns sidecar process into
the main init processes by trying to mknod devices, if it fails on an
EPERM then bind mount the device from the host into the container for
use. This prevents access issues when the sidecar process mknods the
device for the usernamespace returning an EPERM when writting to
dev/null.
This also adds some error handling for init processes and nsinit updates
with added flags for testing and other functions.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2015-02-17 21:37:02 -08:00
f4a4391e4e
Merge pull request #371 from coolljt0725/add_support_cpu_cfs_quota
...
Add systemd support cpu.cfs_quota_us and cpu.cfs_period_us
2015-02-17 10:42:14 -08:00
cc42996625
Merge pull request #382 from crosbymichael/merges
...
Update api branch with master changes
2015-02-16 15:20:01 -08:00
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
Mrunal Patel
Michael Crosby
Alexander Morozov
Victor Marmol
Michael Crosby
Jessica Frazelle
Mrunal Patel
Dan Walsh
Andrey Vagin
Sebastiaan van Stijn
Vincent Batts
Rohit Jnagal
Lei Jitang