0f1d6772c6
libcontainer: rootfs: use CleanPath when comparing paths
...
Comparisons with paths aren't really a good idea unless you're
guaranteed that the comparison will work will all paths that resolve to
the same lexical path as the compared path.
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-06-22 01:45:32 +10:00
5dc3f3576e
Merge pull request #917 from xiekeyang/master
...
remove unused returned variables name
2016-06-16 13:01:58 +01:00
cc29e3dded
Merge pull request #912 from crosbymichael/fifo-userns
...
Fix fifo usage with userns and not root users
2016-06-15 13:00:28 -07:00
55e783b57a
remove unused returned variables name
...
The returned variables name seems be able to removed.
Signed-off-by: xiekeyang <xiekeyang@huawei.com>
2016-06-15 17:41:57 +08:00
42dfd60643
Merge pull request #904 from euank/fix-cgroup-parsing-err
...
cgroups: Fix issue if cgroup path contains :
2016-06-14 14:19:20 +08:00
5ce88a95f6
Fix fifo usage with userns
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-13 20:20:48 -07:00
c0461277f9
Merge pull request #879 from hqhq/list_use_cli_default
...
Use cli default value for list format
2016-06-13 16:06:13 -07:00
f5b6ff23b8
Merge pull request #881 from rajasec/update-status
...
Update for stopped container
2016-06-13 16:05:25 -07:00
96c15e6e3c
Merge pull request #889 from cyphar/tests-provide-debug
...
tests: add debug information for failing tests
2016-06-13 16:04:44 -07:00
85873d917e
Merge pull request #886 from crosbymichael/start-pipe
...
Use fifo for create / start instead of signal handling
2016-06-13 12:36:38 -07:00
3aacff695d
Use fifo for create/start
...
This removes the use of a signal handler and SIGCONT to signal the init
process to exec the users process.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-13 11:26:53 -07:00
8109ec1cc9
Merge pull request #908 from rajasec/stats-var-remove
...
Removing unused variable for cgroup subsystem
2016-06-13 11:07:55 -07:00
8fbe19e020
Merge pull request #905 from crosbymichael/update-readme
...
Update readme for create start
2016-06-13 14:24:42 +01:00
0636bdd45b
Merge pull request #874 from crosbymichael/keyring
...
Add option to disable new session keys
2016-06-12 21:44:45 +10:00
146218ab92
Removing unused variable for cgroup subsystem
...
Signed-off-by: rajasec <rajasec79@gmail.com>
2016-06-12 12:35:49 +05:30
a513998702
Merge pull request #893 from keloyang/leafweight
...
bug fix, LeafWeight nil err
2016-06-11 09:38:18 -07:00
394610a396
cgroups: Parse correctly if cgroup path contains :
...
Prior to this change a cgroup with a `:` character in it's path was not
parsed correctly (as occurs on some instances of systemd cgroups under
some versions of systemd, e.g. 225 with accounting).
This fixes that issue and adds a test.
Signed-off-by: Euan Kemp <euank@coreos.com>
2016-06-10 23:09:03 -07:00
56abe735f2
bug fix, LeafWeight nil err
...
Signed-off-by: root <yangshukui@huawei.com>
2016-06-10 18:11:20 -07:00
762ff42a49
Update readme for create start
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-10 16:37:55 -07:00
ae312e5155
Merge pull request #896 from brauner/devices-fix
...
fail if path to devices subsystem is missing
2016-06-10 11:54:40 -07:00
a4399557f7
Merge pull request #902 from mrunalp/readme_go16
...
readme: Mention the go 1.6 requirement in the README for building runc
2016-06-10 11:49:32 -07:00
e40e71f521
Merge pull request #900 from mrunalp/fix_test
...
bats: Fix spec validation test
2016-06-10 10:54:09 +10:00
b12fbe0b15
readme: Mention the go 1.6 requirement in the README for building runc
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-06-09 16:23:43 -07:00
10d7cfb50e
bats: Fix spec validation test
...
Use the commit that we have in Godeps.json rather than relying on
runtime-spec HEAD
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-06-09 13:16:00 -07:00
eb217f2731
Merge pull request #894 from cyphar/bump-seccomp-32f571b70023028bd57d9288c20efbcb237f3ce0
...
godeps: bump libseccomp-golang to 32f571b70023028bd57d9288c20efbcb237f3ce0
2016-06-08 11:45:26 -07:00
a1f8e0f184
fail if path to devices subsystem is missing
...
The presence of the "devices" subsystem is a necessary condition for a
(privileged) container.
Signed-off-by: Christian Brauner <cbrauner@suse.com>
2016-06-08 16:44:15 +02:00
ec1ccb90f4
godeps: bump libseccomp-golang to 32f571b70023028bd57d9288c20efbcb237f3ce0
...
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-06-08 20:15:18 +10:00
e34cb45a49
Merge pull request #891 from mrunalp/fix_action_sig
...
Add error return to action function signature
2016-06-08 09:11:44 +10:00
1494c72b84
Add error return to action function signature
...
Not having an error return is deprecated
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-06-07 14:42:54 -07:00
fd7d128191
Merge pull request #890 from avagin/emptyns
...
restore: add the empty-ns option
2016-06-07 18:47:32 +01:00
acef7461a4
restore: add the empty-ns option
...
For example:
./runc restore --empty-ns network CTID
In this case criu creates a network namespace, but doesn't restore it.
We are going to use this option to restore docker containers and
Docker sets a hook to restore a network namespace.
https://github.com/xemul/criu/issues/165
Signed-off-by: Andrew Vagin <avagin@virtuozzo.com>
2016-06-07 20:24:59 +03:00
6b4ebb033a
Merge pull request #885 from mrunalp/replace_cli_pkg
...
Replace github.com/codegangsta/cli by github.com/urfave/cli
2016-06-07 09:35:50 -07:00
7222ba6587
tests: add debug information for failing tests
...
bats doesn't automatically print the entirety of $output when an error
has occurred in a test. This makes debugging much harder, so add to the
runc wrapper some more debug information to make maintainers' lives
easier.
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-06-07 18:52:20 +10:00
a753b06645
Replace github.com/codegangsta/cli by github.com/urfave/cli
...
The package got moved to a different repository
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-06-06 11:47:20 -07:00
ab10b6068b
Merge pull request #877 from rajasec/readme-update
...
Updating README for starting the container
2016-06-06 19:16:54 +08:00
8e22b1d36b
Merge pull request #882 from hushan/cleanup_ps
...
cleanup ps.go
2016-06-06 16:12:14 +08:00
772505aa24
cleanup ps.go
...
The code is called in both cases so remove the duplicate one.
Signed-off-by: Hushan Jia <hushan.jia@gmail.com>
2016-06-06 02:36:11 +08:00
0307c88ee9
Updating README for starting the container
...
Signed-off-by: rajasec <rajasec79@gmail.com>
Updating README for starting the container
Signed-off-by: rajasec <rajasec79@gmail.com>
Updating README files for container start
Signed-off-by: rajasec <rajasec79@gmail.com>
updating README files for container start
Signed-off-by: rajasec <rajasec79@gmail.com>
2016-06-05 14:41:58 +05:30
12869604ca
Update for stopped container
...
Signed-off-by: rajasec <rajasec79@gmail.com>
2016-06-04 22:08:08 +05:30
d8e840e8f9
Use cli default value for list format
...
For consistency.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-06-04 16:57:13 +08:00
afaa21f79a
Merge pull request #876 from crosbymichael/bump-spec-10rc1
...
Bump spec and update runc to 1.0.0-rc1
2016-06-03 15:35:53 -07:00
04f275d460
Update runc version to 1.0.0-rc1
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-03 15:25:47 -07:00
d6fbe044c3
Bump spec dependency to 1.0.0-rc1
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-03 15:24:44 -07:00
c4e0d94efa
Merge pull request #873 from joe2far/patch-1
...
Fixed typo in docstring
2016-06-03 12:15:29 -07:00
c6f09f95f2
Merge pull request #868 from rajasec/libcontainer-readme
...
Updating README with set interface
2016-06-03 12:02:41 -07:00
39aeb98025
Merge pull request #872 from rajasec/eventduration
...
runc events hang for zero duration
2016-06-03 12:02:26 -07:00
8c9db3a7a5
Add option to disable new session keys
...
This adds an `--no-new-keyring` flag to run and create so that a new
session keyring is not created for the container and the calling
processes keyring is inherited.
Fixes #818
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-03 11:53:07 -07:00
c5060ff303
Merge pull request #827 from crosbymichael/create-start
...
Implement create and start
2016-06-03 10:38:03 -07:00
f423296b02
Fixed typo in docstring
...
Signed-off-by: joe2far <joe2farrell@gmail.com>
2016-06-03 18:17:53 +01:00
3211c9f721
Merge pull request #867 from rajasec/selinux-process
...
Removing the nil check for process label
2016-06-03 07:58:10 -07:00
Aleksa Sarai