mirror/runc
1
0
Fork 0
mirror of https://github.com/opencontainers/runc.git synced 2026-07-12 09:46:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
2,760 Commits 7 Branches 82 Tags
f55799640143fea4d6ca699ddc2aac72e3e56d7a
Commit Graph

2760 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mrunal Patel f557996401 Add flag to allow getting all mounts for cgroups subsystems 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-09-15 15:19:27 -04:00
Mrunal Patel b1e602e8ba Merge pull request #1039 from crosbymichael/list 
Continue for list on errors
 2016-09-14 15:10:50 -07:00
Michael Crosby 3ada88c9e7 Continue for list on errors 
This will print out the error on stderr when loading a container but
still list everything that was sucessful.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-09-14 14:26:03 -07:00
Mrunal Patel d9ed595245 Merge pull request #1043 from rajasec/events-error 
Removing fatal error from events in stopped state
 2016-09-14 11:39:53 -07:00
Mrunal Patel 51c11a89f7 Merge pull request #1042 from datawolf/out-of-loop 
move m.GetPaths out of the loop
 2016-09-14 11:38:50 -07:00
Mrunal Patel f516b5d082 Merge pull request #1022 from hqhq/add_privileged_for_dbuild 
Add privileged to make dbuild
 2016-09-13 10:07:10 -07:00
Wang Long fd92846686 move m.GetPaths out of the loop 
only call m.GetPaths once is ok. os move it out of the loop.

Signed-off-by: Wang Long <long.wanglong@huawei.com>
 2016-09-13 12:19:48 +00:00
Qiang Huang 710a660506 Merge pull request #1027 from rajasec/bash-completion-create 
Adding bash completion for create and run
 2016-09-13 16:27:00 +08:00
Qiang Huang 5be3ce2817 Merge pull request #1036 from athomason/1035-update-runtime-spec 
Update runtime-spec to current upstream
 2016-09-13 16:10:10 +08:00
Michael Crosby ce0553447b Merge pull request #1038 from keloyang/make-release-fix 
Fix make release error
 2016-09-12 14:04:51 -07:00
Michael Crosby 9a072b611e Merge pull request #1013 from hqhq/fix_ps_issue 
Fix runc ps issue
 2016-09-12 14:03:21 -07:00
Mrunal Patel 124187bea3 Merge pull request #1028 from YummyPeng/fix-typo 
Fix typo.
 2016-09-12 10:00:41 -07:00
Mrunal Patel 88c346e2bd Merge pull request #1033 from crosbymichael/classid 
Change netclassid json tag
 2016-09-12 10:00:19 -07:00
Michael Crosby ad400bb093 Change netclassid json tag 
This allows older state files to be loaded without the unmarshal error
of the string to int conversion.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-09-12 09:31:58 -07:00
rajasec e56e7ce9ca Removing fatal error from events in stopped state 
Signed-off-by: rajasec <rajasec79@gmail.com>
 2016-09-12 21:06:32 +05:30
Shukui Yang 8b151933ed Fix make release error: 
/bin/sh: 1: Syntax error: "(" unexpected
make: *** [release] Error 2
-SHELL ?= $(shell command -v bash 2>/dev/null)
+SHELL := $(shell command -v bash 2>/dev/null)

Signed-off-by: Shukui Yang <yangshukui@huawei.com>
 2016-09-12 18:52:24 +08:00
Qiang Huang b5b6989e9a Fix runc pause and runc update 
Fixes: #1034
Fixes: #1031

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-09-12 16:02:56 +08:00
Qiang Huang da7bac1c90 Fix runc ps issue 
After #1009, we don't always set `cgroup.Paths`, so
`getCgroupPath()` will return wrong cgroup path because
it'll take current process's cgroup as the parent, which
would be wrong when we try to find the cgroup path in
`runc ps` and `runc kill`.

Fix it by using `m.GetPath()` to get the true cgroup
paths.

Reported-by: Yang Shukui <yangshukui@huawei.com>
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-09-12 15:41:16 +08:00
Adam Thomason 98727fbb63 Update spec config path 
Tracks schema/schema.json → schema/config-schema.json rename in
https://github.com/opencontainers/runtime-spec/pull/481/commits/59ede1a6ac23ed10d6b644afc1e8cb45a57aa62e

Signed-off-by: Adam Thomason <ad@mthomason.net>
 2016-09-11 16:48:12 -07:00
Adam Thomason 83cbdbd64c Add checks for nil spec.Linux 
Signed-off-by: Adam Thomason <ad@mthomason.net>
 2016-09-11 16:31:34 -07:00
Adam Thomason fcbde0ce9f Update runtime-spec to current upstream 
runc currently fails to build against the upstream version of
runtime-spec/specs-go.

```
# github.com/opencontainers/runc
./spec.go:189: cannot use specs.Linux literal (type specs.Linux) as type *specs.Linux in field value
```

on account of https://github.com/opencontainers/runtime-spec/commit/63231576ec8460849308b78f0308506010a0f709#diff-7f24d60f0cbb9c433e165467e3d34838R25

This commit updates the dependency to current runtime-spec master and
fixes the type mismatch.

Fixes #1035

Signed-off-by: Adam Thomason <ad@mthomason.net>
 2016-09-11 15:17:14 -07:00
Aleksa Sarai 37f1747aec Merge branch 'pr-914' 
Closes #914
 2016-09-10 17:24:16 +10:00
Yuanhong Peng a71a301a28 Fix typo. 
Signed-off-by: Yuanhong Peng <pengyuanhong@huawei.com>
 2016-09-09 16:18:54 +08:00
rajasec 04f1a4cc98 Adding bash completion for create and run 
Signed-off-by: rajasec <rajasec79@gmail.com>
 2016-09-08 12:14:42 +05:30
Qiang Huang 99c683a84f Merge pull request #1026 from rajasec/runc-readme 
Typo in README.md
 2016-09-08 09:50:27 +08:00
Daniel, Dao Quang Minh da202fe232 Merge pull request #1019 from keloyang/remote-by 
remove redundant by in annotation(nsexec.c)
 2016-09-07 22:01:19 +01:00
Mrunal Patel 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
Mrunal Patel 564866303f Merge pull request #1024 from WeiZhang555/tiny-refactor 
Tiny refactor: remove unused local variables
 2016-09-07 12:22:37 -07:00
Zhang Wei 7303a9a720 Tiny refactor: remove unused local variables 
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
 2016-09-06 23:41:40 +08:00
rajasec c4ffabc033 Typo in README.md 
Signed-off-by: rajasec <rajasec79@gmail.com>
 2016-09-06 20:24:25 +05:30
Qiang Huang aeba315e44 Add privileged to make dbuild 
So we don't get `mount: permission denied` when make dbuild.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-09-06 14:53:46 +08:00
Zhao Lei 54390f89a7 Introduce make release 
So we can make all types of release binary with combination
of following flags:
 seccomp
 selinux
 apparmor
 static

All binary files are put in release/ dir, like:
 [root@zlosvm1 runc]# ls -l release
 total 53556
 -rwxr-xr-x 1 root root 9517965 Aug 24 16:59 runc
 -rwxr-xr-x 1 root root 9673533 Aug 24 17:00 runc.seccomp
 -rwxr-xr-x 1 root root 9705839 Aug 24 17:00 runc.seccomp.selinux
 -rwxr-xr-x 1 root root 9546175 Aug 24 16:59 runc.selinux
 -rwxr-xr-x 1 root root 8205015 Aug 24 16:59 runc.selinux.static
 -rwxr-xr-x 1 root root 8181789 Aug 24 16:59 runc.static
 ...
Closes #899

Signed-off-by: Zhao Lei <zhaolei@cn.fujitsu.com>
 2016-09-06 11:22:34 +08:00
Qiang Huang 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
Jiuyue Ma 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
Shukui Yang e15af9ffbb remove redundant by in annotation(nsexec.c) 
Signed-off-by: Shukui Yang <yangshukui@huawei.com>
 2016-09-05 10:53:19 +08:00
Zhang Wei 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
Qiang Huang 10da74affe Merge pull request #1012 from hqhq/fix_null_point_reference 
Fix null point reference panic
 2016-09-02 09:15:40 +08:00
Qiang Huang aa2dd02f5a Fix null point reference panic 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-09-01 08:34:22 +08:00
Mrunal Patel b79076544e Merge pull request #1009 from hqhq/fix_default_cgroup_parent 
Fix default cgroup path
 2016-08-31 14:23:14 -07:00
Mrunal Patel 795d5ce2da Merge pull request #1008 from hqhq/combine_runc_image 
Combine runctestimage and runcimage
 2016-08-31 14:22:11 -07:00
Michael Crosby bf8d1296a9 Merge pull request #1011 from jonboulle/master 
Fix runtime-spec repository reference in README
 2016-08-31 09:55:42 -07:00
Jonathan Boulle 67a6e679c6 Fix runtime-spec repository reference in README 
Signed-off-by: Jonathan Boulle <jonathanboulle@gmail.com>
 2016-08-31 18:43:57 +02:00
Qiang Huang a8f66ffcaf Update golang to 1.7.0 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-08-31 14:32:02 +08:00
Qiang Huang 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
Qiang Huang 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
Qiang Huang 189a2ab2f7 Merge pull request #1003 from rajasec/container-error 
Error handling when container not exists
 2016-08-27 11:18:55 +08:00
Qiang Huang face64a1ed Merge pull request #880 from rajasec/exec-status 
Not exec a container from stopped state
 2016-08-27 11:07:02 +08:00
Qiang Huang dc9be6cab1 Merge pull request #933 from zhaoleidd/workaround_for_ps 
cli: Workaround for ps's argument
 2016-08-27 10:57:17 +08:00
Mrunal Patel 9b53b362e2 Merge pull request #906 from TristanCacqueray/master 
Add "--" exec cli support for command arguments
 2016-08-26 10:35:26 -07:00
Tristan Cacqueray 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