Commit Graph

1059 Commits

Author SHA1 Message Date
Qiang Huang 12a63757db rename Set to Apply
The name `Set` would be used to do dymanic changes of resource configs
in the future. For now, `Apply` also makes more sense.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-03-04 08:37:55 +08:00
Michael Crosby 025e6be6c5 Merge pull request #421 from LK4D4/network_interface_stats
Make NetworkInterface public
2015-03-03 11:50:15 -08:00
Alexander Morozov 2cd0ee8cf2 Make NetworkInterface public
In other case it is impossible to implement Stats() method from
interface outside libcontainer.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-03 11:07:21 -08:00
Michael Crosby 6c2f20eeec Merge pull request #420 from LK4D4/systemd_stats
Implement stats for systemd
2015-03-03 08:39:34 -08:00
Alexander Morozov dd5576b2b3 Implement stats for systemd
It looks weird but works and not crashes application.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-03-02 14:36:09 -08:00
Michael Crosby 56bc1485df Merge pull request #419 from LK4D4/return_init_err_on_setns
Return init errors from setnsProcess
2015-03-02 13:51:08 -08:00
Alexandr Morozov 152107f44a Return init errors from setnsProcess
Before it produced panic or hanging

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
2015-02-27 15:55:53 -08:00
Mrunal Patel 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
Alexander Morozov 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
Mrunal Patel bcfdee970e Merge pull request #414 from jfrazelle/jessfraz-has-been-shamed-for-life
Fixes validate
2015-02-26 09:37:21 -08:00
Jessica Frazelle 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
Victor Marmol b48acf4613 Merge pull request #410 from hqhq/fix_README
fix instructions in README
2015-02-26 09:12:26 -08:00
Victor Marmol 8d0f911e1d Merge pull request #395 from jfrazelle/add-validate-script
Add a validate script
2015-02-26 09:11:58 -08:00
Qiang Huang 20af7e70e2 fix instructions in README
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2015-02-26 15:02:31 +08:00
Michael Crosby 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
Qiang Huang 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
Mrunal Patel b19b8a9677 Merge pull request #407 from LK4D4/move_console_to_process
Move tty configuration to Process
2015-02-25 15:08:47 -08:00
Alexander Morozov 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
Alexander Morozov f6593810da Merge pull request #400 from mrunalp/exit_cleanup
Exit related cleanup
2015-02-25 13:18:27 -08:00
Mrunal Patel 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
Alexander Morozov d1f0d5705d Return actual ProcessState on Wait error
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-25 11:45:53 -08:00
Mrunal Patel 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
Michael Crosby 286fffa4ee Merge pull request #405 from LK4D4/add_default_init
Add default InitArgs for factory
2015-02-25 09:20:35 -08:00
Alexander Morozov 8600e6f315 Add default InitArgs for factory
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-25 09:11:39 -08:00
Victor Marmol 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
Michael Crosby 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
Michael Crosby 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
Michael Crosby dc34fe1883 Merge pull request #402 from LK4D4/fix_start_comment
Fix comment for container.Start
2015-02-24 16:20:19 -08:00
Alexander Morozov 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
Alexander Morozov b4cda7a6ca Fix comment for container.Start
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-02-24 15:09:43 -08:00
Michael Crosby 9d4f6b3d3d Merge pull request #401 from jfrazelle/remove-drone
remove drone
2015-02-24 15:09:25 -08:00
Jessica Frazelle 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
Mrunal Patel 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
Michael Crosby 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
Alexander Morozov 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
Dan Walsh 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
Dan Walsh 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
Michael Crosby 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
Mrunal Patel 83add60f21 Merge pull request #392 from avagin/api-wait
process: add Wait() and Pid() methods
2015-02-23 13:51:37 -08:00
Jessica Frazelle 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
Andrey Vagin 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
Victor Marmol 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
Alexander Morozov 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
Michael Crosby d64cfe5c05 Merge pull request #390 from vbatts/vbatts-gccgo_constructor
nsenter: noop reference to C constructor
2015-02-23 09:28:14 -08:00
Sebastiaan van Stijn 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
Vincent Batts 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
Victor Marmol 5b73860e65 Merge pull request #388 from docker/api
Merge API Branch into Master
2015-02-19 16:30:01 -08:00
Victor Marmol 7eceabd47f Merge pull request #389 from crosbymichael/mergeapi
Merge master into api
2015-02-19 16:08:09 -08:00
Michael Crosby 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
Victor Marmol 1b755bf962 Merge pull request #386 from mrunalp/userns_check
Validation for user namespace in the config.
2015-02-19 09:16:13 -08:00