0dee9793d5
Merge pull request #416 from LK4D4/fix_mount_join
...
Don't join rootfs if path already prefixed by it
2015-02-26 14:59:48 -08:00
087caf69e8
Don't join rootfs if path already prefixed by it
...
In docker we evaluate all symlinks im path to check that they not escaping
from rootfs and that gives us full path to mount.
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-26 13:08:15 -08:00
bcfdee970e
Merge pull request #414 from jfrazelle/jessfraz-has-been-shamed-for-life
...
Fixes validate
2015-02-26 09:37:21 -08:00
3c474b9e2a
Fixes validate
...
I'm the worst, shame, shame, shame has been brough unto my family
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
2015-02-26 09:36:29 -08:00
b48acf4613
Merge pull request #410 from hqhq/fix_README
...
fix instructions in README
2015-02-26 09:12:26 -08:00
8d0f911e1d
Merge pull request #395 from jfrazelle/add-validate-script
...
Add a validate script
2015-02-26 09:11:58 -08:00
20af7e70e2
fix instructions in README
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-02-26 15:02:31 +08:00
9d91f080ce
Merge pull request #409 from hqhq/rename_test_files
...
rename test files so we can really test them
2015-02-25 19:09:23 -08:00
53fce30755
rename test files so we can really test them
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-02-26 09:49:57 +08:00
b19b8a9677
Merge pull request #407 from LK4D4/move_console_to_process
...
Move tty configuration to Process
2015-02-25 15:08:47 -08:00
8d0b06257b
Move tty configuration to Process
...
Now you need to call Process.NewConsole to setup console for process
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-25 15:04:43 -08:00
f6593810da
Merge pull request #400 from mrunalp/exit_cleanup
...
Exit related cleanup
2015-02-25 13:18:27 -08:00
fff015f409
Merge pull request #406 from LK4D4/return_state_on_err
...
Return actual ProcessState on Wait error
2015-02-25 13:18:18 -08:00
d1f0d5705d
Return actual ProcessState on Wait error
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-25 11:45:53 -08:00
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
Mrunal Patel
Alexander Morozov
Jessica Frazelle
Victor Marmol
Qiang Huang
Michael Crosby
Alexander Morozov
Mrunal Patel
Michael Crosby
Dan Walsh
Andrey Vagin
Sebastiaan van Stijn
Vincent Batts
Rohit Jnagal