Commit graph

393 commits

Author SHA1 Message Date
Antonio Murdaca
b3f0920fe8 Merge pull request #156 from mrunalp/pod_meta_filter
Pod filtering support
2016-10-17 23:34:15 +02:00
Mrunal Patel
2be40e0a31 Add tests for pod filtering
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-17 12:51:21 -07:00
Mrunal Patel
1694591f6c Add support for adding labels at pod creation time
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-17 12:33:48 -07:00
Mrunal Patel
2cc40ef9ef Add client support for filtering pods
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-17 12:25:30 -07:00
Mrunal Patel
5e7d96bd6a Add server side pod filtering support
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-17 12:24:57 -07:00
Mrunal Patel
01c8785ea4 Use Set instead of map for storing pod labels
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-17 11:28:48 -07:00
Antonio Murdaca
63614ff690 Merge pull request #154 from rhatdan/selinux
Make sure selinuxenabled exists before executing it
2016-10-17 17:24:38 +02:00
Antonio Murdaca
2c77091a54 Merge pull request #151 from hqhq/fix_makefile_rm
Makefile: fix remove docs in make clean
2016-10-17 14:59:52 +02:00
Dan Walsh
488216f57b Make sure selinuxenabled exists before executing it
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-10-17 08:48:14 -04:00
Qiang Huang
f3bc6d3660 Makefile: fix remove docs in make clean
On Ubuntu, `/bin/sh` is used in Makefile by default, so
a.{1,2,3} isn't evaluated to a.1 a.2 a.3, another solution
is to use `SHELL=/bin/bash` in Makefile, but I don't think
we should bind to bash this early, at least not for this
case.

This also remove the removal of docs/*.1 which doesn't
exist for now.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-10-17 13:15:41 +08:00
Antonio Murdaca
0c7f83dd1f Merge pull request #148 from rhatdan/selinux
Setup proper labeling for runnin test with selinux
2016-10-15 01:32:52 +02:00
Dan Walsh
04807d586a Setup proper labeling for running test with selinux
The rootfs that gets created needs to have an SELinux label that containers
can write to.  Until they get native storage support, this patch will
force the entire storage pool to be labeled in such a way that confined
containers can read/write/execute the content.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-10-14 17:29:20 -04:00
Mrunal Patel
91efd54e2b Merge pull request #145 from rhatdan/makefile
Fix up Makefile, to only build when needed
2016-10-14 14:04:24 -07:00
Dan Walsh
a14ddbde94 Fix up Makefile, to only build when needed
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-10-14 16:48:42 -04:00
Antonio Murdaca
3a69841225 Merge pull request #146 from mrunalp/create_label
Allow adding labels at container create time
2016-10-14 21:29:52 +02:00
Mrunal Patel
e1a4b71478 Add more tests for label filtering
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-14 12:06:10 -07:00
Mrunal Patel
52dc8e4865 Add support for adding labels at ctr create time
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-14 12:05:47 -07:00
Antonio Murdaca
24bb1523cf Merge pull request #138 from mrunalp/labels
Add support for label filtering
2016-10-14 19:06:19 +02:00
Mrunal Patel
1d58bc8eae Add a test for label filtering
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-14 09:58:09 -07:00
Mrunal Patel
0898f1cb61 Merge pull request #144 from runcom/vendor-runc-label-selinux
vendor opencontainers/runc 3abefdff18bc201199c5dfd0e91e941cb4c61376
2016-10-14 08:31:34 -07:00
Antonio Murdaca
7894fba5b5
vendor opencontainers/runc 3abefdff18bc201199c5dfd0e91e941cb4c61376
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-10-14 17:24:37 +02:00
Mrunal Patel
6206c2e6ae Merge pull request #141 from 14rcole/manpage-install
Fix installation of manpages
2016-10-14 08:20:28 -07:00
Ryan Cole
44afbcb947 Fix installation of manpages
Previously, the markdown versions of the man pages were copied to
their respective locations, but these cannot be parsed by the man
command.  The Makefile was updated to gzip the man pages generated
by go-md2man and install the gzipped files into their respective
man directories.
Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
2016-10-14 08:34:49 -04:00
Mrunal Patel
f12d94100c Add client changes for filtering containers by labels
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-13 17:02:02 -07:00
Mrunal Patel
d2cae34243 Add server side container label filtering
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-13 17:01:31 -07:00
Mrunal Patel
50cc7ce940 Use Set instead of map[string]string for container labels
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-13 15:45:41 -07:00
Mrunal Patel
c6f509b832 Update vendor to include selector/fields packages from kubernetes
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-13 15:37:13 -07:00
Antonio Murdaca
0609c944f1 Merge pull request #120 from mrunalp/ctr_filter
Add container filtering support
2016-10-13 21:52:07 +02:00
Mrunal Patel
1bb79c9bbb Add a test for container list filtering
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-13 12:40:07 -07:00
Mrunal Patel
8d88bf1ab1 Add client support for filtering containers
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-13 12:40:07 -07:00
Mrunal Patel
09049fc357 Filter containers by id, pod id and state in container list
Signed-off-by: Mrunal Patel <mpatel@redhat.com>
2016-10-13 12:40:02 -07:00
Mrunal Patel
1fc46973a9 Merge pull request #137 from 14rcole/build-instructions
README.md: Update build instructions
2016-10-13 12:36:04 -07:00
Ryan Cole
ad7c98b7a6 README.md: Update build instructions
The 'make binaries' command requires the existence of
libc.a.  On Fedora this file is included in the glibc-static
package.  If this is not installed the user will get the error
'/usr/bin/ld: cannot find -lc'.  On Ubuntu this is not an issue.
The README was updated to reflect this dependency.

Signed-off-by: Ryan Cole <rcyoalne@gmail.com>
2016-10-13 14:58:50 -04:00
Mrunal Patel
da4cc11077 Merge pull request #135 from runcom/sdnotify
Sdnotify
2016-10-13 11:00:22 -07:00
Antonio Murdaca
93ba37d00b
vendor go-systemd
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-10-13 19:40:18 +02:00
Mrunal Patel
8cebe5c612 Merge pull request #130 from runcom/fix-127
server/sandbox: fix add/release pod/ctr ids and names
2016-10-13 10:18:19 -07:00
Antonio Murdaca
8a9395964e
server/sandbox: fix add/release pod/ctr ids and names
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-10-13 18:48:23 +02:00
Mrunal Patel
0b45bfcb36 Merge pull request #134 from runcom/sort-flags
cmd/server: sort flags
2016-10-13 09:00:39 -07:00
Antonio Murdaca
cf677a20f6
cmd/server: sort flags
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-10-13 16:57:48 +02:00
Dan Walsh
09bed25074 Add support for sd_notify
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-10-13 09:45:31 -04:00
Dan Walsh
c1b9838af5 Add support got ocid.conf generation and install
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-10-13 09:45:31 -04:00
Dan Walsh
72b192c4cf Add ocid.service
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-10-13 09:45:31 -04:00
Antonio Murdaca
78438e0ec6 Merge pull request #133 from rhatdan/docs
Cleanup help and add options to man page
2016-10-13 15:34:09 +02:00
Dan Walsh
f6d9d626a9 Cleanup help and add options to man page
Missing options from man page, and sort options alphabetically, as best
we can.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-10-13 09:26:28 -04:00
Mrunal Patel
e999610fd6 Merge pull request #115 from cyphar/toml-config
cmd: server: use TOML configuration file
2016-10-11 16:07:25 -07:00
Mrunal Patel
1f11bb7ab7 Merge pull request #126 from runcom/skip-sb-nil
server/server: skip f no sandbox when restoring containers
2016-10-11 15:51:15 -07:00
Antonio Murdaca
be2b0cfa50
server/server: skip f no sandbox when restoring containers
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-10-12 00:36:34 +02:00
Mrunal Patel
472893cfbe Merge pull request #122 from Crazykev/fix-name-release
pod/container name should be released when create failed
2016-10-11 11:10:55 -07:00
Antonio Murdaca
401410c6e9 Merge pull request #123 from mikebrow/readme-updates
mention make docs
2016-10-11 19:00:56 +02:00
Mike Brown
73c695c9e2 Mention make docs.
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2016-10-11 11:46:02 -05:00