Commit Graph

2612 Commits

Author SHA1 Message Date
Mrunal Patel 9d7831e41d Merge pull request #930 from hqhq/fix_state_detection
Make state detection precise
2016-07-06 09:51:55 -07:00
Daniel, Dao Quang Minh 0b5d51cbb0 Merge pull request #928 from mlaventure/add-force-to-delete
Add force to delete
2016-07-06 16:59:58 +01:00
Qiang Huang 14e95b2aa9 Make state detection precise
Fixes: https://github.com/opencontainers/runc/issues/871

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-07-05 08:24:13 +08:00
Mrunal Patel 7221e38782 Merge pull request #929 from mlaventure/tag-image-with-git-branch
Use git branch name as tag when building images
2016-07-01 15:11:51 -07:00
Kenfe-Mickael Laventure 9fc9d10e57 Add `--force` flag to `runc delete`
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-30 07:55:44 -07:00
Kenfe-Mickael Laventure 9977d24388 Use git branch name as tag when building images
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
2016-06-29 07:26:48 -07:00
Alexander Morozov 629e35666d Merge pull request #925 from cyphar/fix-path-checks
rootfs: clean up
2016-06-24 12:10:23 -07:00
Mrunal Patel 9123ce66ce Merge pull request #922 from cyphar/test-uid-gid
tests: add tests with {u,g}id != 0
2016-06-24 12:09:14 -07:00
Aleksa Sarai c29695ad0a
rootfs: don't change directory
There's no point in changing directory here. Syscalls are resolved local
to the linkpath, not to the current directory that the process was in
when creating the symlink. Changing directories just confuses people who
are trying to debug things.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-06-24 16:44:40 +10:00
Mrunal Patel 9b3a2f1634 Merge pull request #919 from zhaoleidd/fix_ps_argument_manual
Fix ps argument manual
2016-06-23 10:17:47 -07:00
Aleksa Sarai 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
Aleksa Sarai c77eb1c413 tests: add tests with {u,g}id != 0
This is a very important testcase, as certain permission issues can
arise if we don't test this automatically.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-06-18 12:16:42 +10:00
Zhao Lei 71929e0f9d Fix ps argument manual
Argument of "ps options" for ps command is a optional parameter.
Should use [] instead of <> in manual.

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
2016-06-17 19:07:30 +08:00
Daniel, Dao Quang Minh 5dc3f3576e Merge pull request #917 from xiekeyang/master
remove unused returned variables name
2016-06-16 13:01:58 +01:00
Alexander Morozov 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
xiekeyang 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
Qiang Huang 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
Michael Crosby 5ce88a95f6 Fix fifo usage with userns
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-13 20:20:48 -07:00
Mrunal Patel 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
Mrunal Patel f5b6ff23b8 Merge pull request #881 from rajasec/update-status
Update for stopped container
2016-06-13 16:05:25 -07:00
Mrunal Patel 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
Alexander Morozov 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
Michael Crosby 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
Mrunal Patel 8109ec1cc9 Merge pull request #908 from rajasec/stats-var-remove
Removing unused variable for cgroup subsystem
2016-06-13 11:07:55 -07:00
Daniel, Dao Quang Minh 8fbe19e020 Merge pull request #905 from crosbymichael/update-readme
Update readme for create start
2016-06-13 14:24:42 +01:00
Aleksa Sarai 0636bdd45b Merge pull request #874 from crosbymichael/keyring
Add option to disable new session keys
2016-06-12 21:44:45 +10:00
rajasec 146218ab92 Removing unused variable for cgroup subsystem
Signed-off-by: rajasec <rajasec79@gmail.com>
2016-06-12 12:35:49 +05:30
Mrunal Patel a513998702 Merge pull request #893 from keloyang/leafweight
bug fix, LeafWeight nil err
2016-06-11 09:38:18 -07:00
Euan Kemp 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
root 56abe735f2 bug fix, LeafWeight nil err
Signed-off-by: root <yangshukui@huawei.com>
2016-06-10 18:11:20 -07:00
Michael Crosby 762ff42a49 Update readme for create start
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-06-10 16:37:55 -07:00
Michael Crosby 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
Michael Crosby 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
Aleksa Sarai e40e71f521 Merge pull request #900 from mrunalp/fix_test
bats: Fix spec validation test
2016-06-10 10:54:09 +10:00
Mrunal Patel 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
Mrunal Patel 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
Mrunal Patel eb217f2731 Merge pull request #894 from cyphar/bump-seccomp-32f571b70023028bd57d9288c20efbcb237f3ce0
godeps: bump libseccomp-golang to 32f571b70023028bd57d9288c20efbcb237f3ce0
2016-06-08 11:45:26 -07:00
Christian Brauner 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
Aleksa Sarai ec1ccb90f4 godeps: bump libseccomp-golang to 32f571b70023028bd57d9288c20efbcb237f3ce0
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-06-08 20:15:18 +10:00
Aleksa Sarai 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
Mrunal Patel 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
Daniel, Dao Quang Minh fd7d128191 Merge pull request #890 from avagin/emptyns
restore: add the empty-ns option
2016-06-07 18:47:32 +01:00
Andrew Vagin 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
Alexander Morozov 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
Aleksa Sarai 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
Mrunal Patel 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
Qiang Huang ab10b6068b Merge pull request #877 from rajasec/readme-update
Updating README for starting the container
2016-06-06 19:16:54 +08:00
Qiang Huang 8e22b1d36b Merge pull request #882 from hushan/cleanup_ps
cleanup ps.go
2016-06-06 16:12:14 +08:00
Hushan Jia 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
rajasec 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