jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
1,133 Commits 5 Branches 25 Tags 17 MiB
Commit Graph

1133 Commits

Author SHA1 Message Date
Pavel Tikhomirov dc4bd4cece systemd: properly check DefaultDependencies is read only 
on systemd v208 in Centos7 and Fedora20 error is not:
"org.freedesktop.DBus.Error.PropertyReadOnly"
but:
"property.org.freedesktop.DBus.Error.PropertyReadOnly"
so check failes and in Docker we get:
Docker daemon: System error: Cannot set property DefaultDependencies, or
unknown property

Fix for commit:
99233fde8c

Signed-off-by: Pavel Tikhomirov <ptikhomirov@parallels.com>
 2015-03-23 09:44:15 +03:00
Victor Marmol b6cf7a6c85 Merge pull request #460 from sunyuan3/l1 
correct comment errors for netlink_linux.go
 2015-03-20 08:16:38 -07:00
Yuan Sun 4fdec5a8e1 correct comment errors for netlink_linux.go 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-03-20 07:55:11 +08:00
Mrunal Patel 4a72e540fe Merge pull request #459 from LK4D4/tmpfs_root 
Add TmpfsRoot option
 2015-03-19 11:31:11 -07:00
Alexander Morozov 870119e763 Add TmpfsRoot option 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-19 11:05:59 -07:00
Michael Crosby 14a7d2f468 Merge pull request #455 from mrunalp/remove_base_mounts 
mount: Take out the base mounts and move them to the config.
 2015-03-19 11:03:01 -07:00
Victor Marmol 4622c8ac95 Merge pull request #441 from hqhq/hq_change_set_api 
add parameter to Set api
 2015-03-18 10:56:20 -07:00
Mrunal Patel bc1d229dbe Update test. 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-03-17 14:09:33 -04:00
Mrunal Patel c1ca18404f mount: Take out the base mounts and move them to the config. 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-03-17 14:03:28 -04:00
Victor Marmol 52a8c004ca Merge pull request #453 from vishh/parent_cgroup 
Do not fail cgroups setup if parent cgroup does not exist.
 2015-03-16 15:00:59 -07:00
Vishnu Kannan 9bebc66042 Do not fail cgroups setup if parent cgroup does not exist. 
Docker-DCO-1.1-Signed-off-by: Vishnu Kannan <vishnuk@google.com> (github: vishh)
 2015-03-16 21:09:37 +00:00
Victor Marmol 0596e6384a Merge pull request #451 from mrunalp/mounts_fix 
mount: sysfs also doesn't need to be labelled like mqueue.
 2015-03-16 11:29:14 -07:00
Mrunal Patel 3125b53b1a mount: sysfs also doesn't need to be labelled like mqueue. 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-03-16 14:05:20 -04:00
Mrunal Patel 71a57166c1 Merge pull request #450 from avagin/dind 
Fix path to /dind
 2015-03-16 09:53:11 -07:00
Andrew Vagin 6922824833 Fix path to /dind 
That script was moved a few days ago
https://github.com/docker/docker/pull/11373

Signed-off-by: Andrew Vagin <avagin@openvz.org>
 2015-03-16 19:45:18 +03:00
Alexander Morozov 000d36e109 Merge pull request #443 from mrunalp/getfilecon_fix 
selinux: Adds a check for a NUL byte at the end of the string and removes it
 2015-03-13 11:45:27 -07:00
Victor Marmol aaca2848a1 Merge pull request #430 from LK4D4/vet_checks 
Add vet checks to validate script
 2015-03-13 11:40:54 -07:00
Alexander Morozov 5d6c507d7c Merge pull request #449 from estesp/update-busybox-tar 
Update to recent busybox 2014.11 tar
 2015-03-12 15:03:41 -07:00
Phil Estes ad3d14f1da Update to recent busybox 2014.11 tar 
Move up to the latest busybox tarball that has the fix for `ip` command
segfault.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
 2015-03-12 17:54:43 -04:00
Mrunal Patel d658fb8a25 Merge pull request #448 from crosbymichael/nsinit-usability 
nsinit usability improvements
 2015-03-12 12:05:15 -07:00
Michael Crosby c22d5c90cf Remove default log 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-12 12:00:01 -07:00
Mrunal Patel 58feafa848 Merge pull request #442 from rhatdan/tmpfsperms 
Mounting a tmpfs directory needs to inherit directory permissions from base
 2015-03-11 21:10:31 -07:00
Michael Crosby 7c8550af53 Merge pull request #447 from jfrazelle/update-logrus 
Update logrus to 0.6.6
 2015-03-11 16:51:52 -07:00
Jessica Frazelle 3e9299d6da Update logrus to 0.6.6 
we did the same for docker/docker so now they are inline.

Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
 2015-03-11 16:53:40 -07:00
Mrunal Patel f7837f4f71 Merge pull request #446 from icecrime/hairpin-nat-re 
Hairpin NAT network configuration
 2015-03-11 14:49:12 -07:00
Arnaud Porterie e1c14b3ca2 Hairpin NAT network configuration 
Offer the ability to enable hairpin NAT on a per network basis, while
keeping it disable by default as it is unsupported by older kernel.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-03-11 13:42:37 -07:00
Dan Walsh 9f2c67332f Mounting a tmpfs directory needs to inherit directory permissions from base 
Docker-DCO-1.1-Signed-off-by: Dan Walsh <dwalsh@redhat.com> (github: rhatdan)
 2015-03-11 15:33:35 -04:00
Michael Crosby ef4efd065c Merge pull request #445 from LK4D4/add_type_method 
Add information Type method for Factory
 2015-03-11 11:52:46 -07:00
Mrunal Patel aa10040b57 Merge pull request #444 from ncdc/dont-label-mqueue 
Don't label mqueue when mounting
 2015-03-11 11:46:47 -07:00
Michael Crosby 3977c892e7 Remove --create from nsinit and make it default 
More people are using this to test new features and this makes it very
simple to run a container with a simple command.

`nsinit exec --tty sh`

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2015-03-11 11:46:11 -07:00
Alexander Morozov c44ab12c86 Add information Type method for Factory 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-11 11:44:56 -07:00
Andy Goldstein 2ca9dc306e Don't label mqueue when mounting 
mqueue shouldn't be labeled when mounting; otherwise, the mount will
fail.

Signed-off-by: Andy Goldstein <agoldste@redhat.com>
 2015-03-11 14:30:26 -04:00
Mrunal Patel a9442e6660 selinux: Adds a check for a NUL byte at the end of the string and removes 
it.

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2015-03-11 14:10:37 -04:00
Qiang Huang d6eb76f8a2 add parameter to Set api 
We only have libcontainer.Container on Docker side, can't change `config`
in linuxContainer, pass config to libcontainer so we can change config of
container.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-03-11 16:46:54 +08:00
Michael Crosby 9387ebb6ba Merge pull request #437 from hqhq/hq_fix_some_cgroups_issues 
fix some cgroups issues
 2015-03-10 14:04:10 -07:00
Mrunal Patel 2da159823d Merge pull request #439 from vbatts/vbatts-fix_unused_variable_warning 
nsenter: fix the -Wunused-variable warning
 2015-03-10 11:54:25 -07:00
Vincent Batts 2a9511a026 nsenter: fix the -Wunused-variable warning 
The change 699429e60f that allows the
constructor attribute to not be optimized out on gccgo has resulted in a
warning when compiling on the golang compiler.

```
./nsenter.go: In function ‘_cgo_51505a0edd5d_Cfunc_init’:
./nsenter.go:40:49: warning: unused variable ‘a’ [-Wunused-variable]
```

the generated code produced an unused struct like:

```
void
_cgo_d6cfae95ae01_Cfunc_init (void *v)
{
  struct
  {
    char unused;
  } __attribute__ ((__packed__, __gcc_struct__)) * a = v;
  init ();
}
```

Truly the "fix" would be upstream in cgo. If it knows it is producing an
unused struct, then it should also include __attribute__ ((unused))

Signed-off-by: Vincent Batts <vbatts@hashbangbash.com>
 2015-03-10 14:43:09 -04:00
Victor Marmol 43fabe36d1 Merge pull request #438 from hqhq/hq_add_memoryswap_test 
add Set memoryswap test cases
 2015-03-09 10:17:20 -07:00
Qiang Huang 35c01f9eb3 add Set memoryswap test cases 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-03-09 10:25:12 +08:00
Qiang Huang a3b0209cc6 cgroups: don't use d.path for cgroup tests files 
d.path() should be used to get the real cgroup path, for temp path,
we can just create one.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-03-09 09:32:02 +08:00
Qiang Huang 606d9064b0 cgroups: only return path when subsystem really mounted 
If cgroup patch doesn't exist, there is no point we do the Set.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2015-03-09 09:16:56 +08:00
Mrunal Patel 83663f82e3 Merge pull request #435 from pmorie/selinux-doc 
Add godoc for selinux package
 2015-03-06 12:33:03 -08:00
Paul Morie 4fc29224cf Add godoc for selinux package 
Docker-DCO-1.1-Signed-off-by: Paul Morie <pmorie@gmail.com> (github: pmorie)
 2015-03-06 13:28:52 -05:00
Rohit Jnagal 074441b495 Merge pull request #429 from hqhq/hq_use_FindCgroupMountRoot 
fix apply error when we not mount cpu subsystem
 2015-03-06 10:11:16 -08:00
Victor Marmol dd3cb88223 Merge pull request #417 from HuKeping/master 
cgroups: add support for oom control
 2015-03-06 08:31:40 -08:00
HuKeping 4332ffcfc6 cgroups: add test for disable oom killer 
Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-03-07 02:49:34 +08:00
HuKeping 295c70865d cgroups: add support for oom control 
This patch add support for diable OOM Killer.

Signed-off-by: Hu Keping <hukeping@huawei.com>
 2015-03-07 02:49:31 +08:00
Mrunal Patel 334b196371 Merge pull request #432 from LK4D4/os_environ 
Pass os.Environ() as environment to process from init.
 2015-03-05 14:49:24 -08:00
Alexander Morozov 9744d72c74 Pass os.Environ() as environment to process from init. 
Replacement of #418

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-03-05 14:44:40 -08:00
Mrunal Patel d4867a6583 Merge pull request #431 from LK4D4/fix_nsenter_test_hang 
Remove overcomplicated logic of SIGCHLD from TestNsenterDeadPid
 2015-03-05 13:58:47 -08:00