99c683a84f
Merge pull request #1026 from rajasec/runc-readme
...
Typo in README.md
2016-09-08 09:50:27 +08:00
da202fe232
Merge pull request #1019 from keloyang/remote-by
...
remove redundant by in annotation(nsexec.c)
2016-09-07 22:01:19 +01:00
c6b3e79d30
Merge pull request #1017 from WeiZhang555/version-dirty
...
Append string "-dirty" to version if git repo is unclean
2016-09-07 12:24:19 -07:00
564866303f
Merge pull request #1024 from WeiZhang555/tiny-refactor
...
Tiny refactor: remove unused local variables
2016-09-07 12:22:37 -07:00
7303a9a720
Tiny refactor: remove unused local variables
...
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-09-06 23:41:40 +08:00
c4ffabc033
Typo in README.md
...
Signed-off-by: rajasec <rajasec79@gmail.com>
2016-09-06 20:24:25 +05:30
7b0b628a9b
Merge pull request #1020 from forever043/fix-makefile-integration
...
Makefile: Fix wrong dependency of "integration" target
2016-09-06 09:05:28 +08:00
4bc8637393
Makefile: Fix wrong dependency of "integration" target
...
Change dependency of integration to runcimage.
Signed-off-by: Jiuyue Ma <majiuyue@huawei.com>
2016-09-06 08:38:32 +08:00
e15af9ffbb
remove redundant by in annotation(nsexec.c)
...
Signed-off-by: Shukui Yang <yangshukui@huawei.com>
2016-09-05 10:53:19 +08:00
9f80653779
Append string "-dirty" to version if git repo is unclean
...
If runc binary is compiled from codes with modified but not commited
files, git commits should report "COMMIT-dirty" instead of single
"COMMIT" to warn users.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2016-09-04 16:08:39 +08:00
10da74affe
Merge pull request #1012 from hqhq/fix_null_point_reference
...
Fix null point reference panic
2016-09-02 09:15:40 +08:00
aa2dd02f5a
Fix null point reference panic
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-09-01 08:34:22 +08:00
b79076544e
Merge pull request #1009 from hqhq/fix_default_cgroup_parent
...
Fix default cgroup path
2016-08-31 14:23:14 -07:00
795d5ce2da
Merge pull request #1008 from hqhq/combine_runc_image
...
Combine runctestimage and runcimage
2016-08-31 14:22:11 -07:00
bf8d1296a9
Merge pull request #1011 from jonboulle/master
...
Fix runtime-spec repository reference in README
2016-08-31 09:55:42 -07:00
67a6e679c6
Fix runtime-spec repository reference in README
...
Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
2016-08-31 18:43:57 +02:00
a8f66ffcaf
Update golang to 1.7.0
...
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-08-31 14:32:02 +08:00
220e5098a8
Fix default cgroup path
...
Alternative of #895 , part of #892
The intension of current behavior if to create cgroup in
parent cgroup of current process, but we did this in a
wrong way, we used devices cgroup path of current process
as the default parent path for all subsystems, this is
wrong because we don't always have the same cgroup path
for all subsystems.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-08-30 14:12:15 +08:00
0c80599812
Combine runctestimage and runcimage
...
There is no need that keep them separate, it also
fixes #1006 .
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-08-30 09:46:47 +08:00
189a2ab2f7
Merge pull request #1003 from rajasec/container-error
...
Error handling when container not exists
2016-08-27 11:18:55 +08:00
face64a1ed
Merge pull request #880 from rajasec/exec-status
...
Not exec a container from stopped state
2016-08-27 11:07:02 +08:00
dc9be6cab1
Merge pull request #933 from zhaoleidd/workaround_for_ps
...
cli: Workaround for ps's argument
2016-08-27 10:57:17 +08:00
9b53b362e2
Merge pull request #906 from TristanCacqueray/master
...
Add "--" exec cli support for command arguments
2016-08-26 10:35:26 -07:00
c562e4cd91
exec: Support command arguments
...
This enables support for exec command argument starting with a '-'.
This uses the usual argument separator '--', for example:
runc exec containerid -- ps -afx
Without this, cli interprets command argument and fails with
'flag provided but not defined'.
Signed-off-by: Tristan Cacqueray <tdecacqu@redhat.com>
2016-08-26 02:01:40 +00:00
1e319efa36
Merge pull request #815 from rajasec/basecont-comments
...
Updated the libcontainer interface comments
2016-08-26 09:43:50 +08:00
714550f87c
Error handling when container not exists
...
Signed-off-by: rajasec <rajasec79@gmail.com>
Error handling when container not exists
Signed-off-by: rajasec <rajasec79@gmail.com>
Error handling when container not exists
Signed-off-by: rajasec <rajasec79@gmail.com>
Error handling when container not exists
Signed-off-by: rajasec <rajasec79@gmail.com>
2016-08-26 00:00:54 +05:30
91dd6d2452
Merge pull request #1002 from crosbymichael/stopped
...
Return 0 for pid if container is stopped
2016-08-25 18:18:32 +01:00
4294d882b1
Return 0 for pid if container is stopped
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-08-25 09:44:48 -07:00
46d9535096
Merge pull request #934 from macrosheep/fix-initargs
...
Fix and refactor init args
2016-08-24 10:06:01 -07:00
4d34c30196
Merge pull request #988 from chlunde/i386-32-bit-uid
...
Support 32 bit UID on i386
2016-08-24 09:55:41 -07:00
c92d105863
Merge pull request #997 from xiekeyang/defer
...
let defer function
2016-08-24 11:15:53 +01:00
e43f740ed7
Merge branch 'pr-987'
...
Closes #987 [Test: Make TestCaptureTestFunc pass in localunittest]
2016-08-24 18:37:06 +10:00
a56fc8264c
Merge branch 'pr-878'
...
Closes #878 [Adjust man pages for create start split].
2016-08-24 18:35:11 +10:00
200f8cb69d
let defer function
...
Signed-off-by: xiekeyang <xiekeyang@huawei.com>
2016-08-24 11:35:49 +08:00
b4ffe2974d
Merge pull request #995 from estesp/starttime-for-criu-container
...
Restored-from-checkpoint containers should have a start time
2016-08-23 15:07:14 -07:00
0c6733d669
Merge pull request #970 from hqhq/fix_race_cgroup_paths
...
Fix race condition when using cgroups.Paths
2016-08-23 10:47:00 -07:00
1ea17d73fe
Updated the libcontainer interface comments
...
Signed-off-by: rajasec <rajasec79@gmail.com>
2016-08-23 19:14:27 +05:30
98d63504a4
Not exec a container from stopped state
...
Signed-off-by: rajasec <rajasec79@gmail.com>
2016-08-23 18:25:08 +05:30
31d51c10e1
Merge branch 'pr-994'
...
Closes #994
2016-08-23 01:47:41 +10:00
206fea7f50
remove unused code
...
Signed-off-by: xiekeyang <xiekeyang@huawei.com>
2016-08-22 17:16:45 +08:00
85f4d20b44
Restored-from-checkpoint containers should have a start time
...
Set the start time similar to a brand new container.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2016-08-21 18:15:18 -04:00
c520720728
Merge pull request #993 from crosbymichael/disable-subreaper-exec
...
Disable the subreaper on exec
2016-08-19 18:18:08 +01:00
f61c6e413f
Disable the subreaper on exec
...
This keeps the flag but makes it hidden so that existing clients do not
encounter an error if we were to have removed the flag.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
2016-08-19 09:56:00 -07:00
84c344d260
Merge pull request #992 from xiekeyang/master
...
move util function
2016-08-19 15:56:40 +01:00
2fcbb5a494
move util function
...
Signed-off-by: xiekeyang <xiekeyang@huawei.com>
2016-08-19 16:08:06 +08:00
6df383c2f8
Merge pull request #989 from mrunalp/fix_format
...
Fix format specifier for size_t
2016-08-17 11:54:33 -07:00
0bd675a56c
Fix format specifier for size_t
...
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-08-17 11:40:08 -07:00
aee3f6ff5a
Merge pull request #950 from cyphar/cleanup-nsenter
...
nsenter: major cleanups
2016-08-16 16:00:22 -07:00
4e72ffc237
nsenter: simplify netlink parsing
...
This just moves everything to one function so we don't have to pass a
bunch of things to functions when there's no real benefit. It also makes
the API nicer.
Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-08-17 08:21:48 +10:00
0a45903563
Support 32 bit UID on i386
...
The original SETUID takes a 16 bit UID. Linux 2.4 introduced a new
syscall, SETUID32, with support for 32 bit UIDs. The setgid wrapper
already uses SETGID32.
Signed-off-by: Carl Henrik Lunde <chlunde@ifi.uio.no>
2016-08-16 22:47:38 +02:00
Qiang Huang
Daniel, Dao Quang Minh
Mrunal Patel
Zhang Wei
rajasec
Jiuyue Ma
Shukui Yang
Michael Crosby
Jonathan Boulle
Tristan Cacqueray
Aleksa Sarai
xiekeyang
Alexander Morozov
Phil Estes
Mrunal Patel
Carl Henrik Lunde