11 commits

Author	SHA1	Message	Date
Samuel Ortiz	c525459000	main: Add CNI options ... We add 2 ocid options for choosing the CNI configuration and plugin binaries directories: --cni-config-dir and --cni-plugin-dir. Signed-off-by: Samuel Ortiz <sameo@linux.intel.com>	2016-12-20 12:50:17 +01:00
Mrunal Patel	79073df3c2	Merge pull request #215 from xlgao-zju/support-apparmor ... support apparmor	2016-12-05 21:24:50 -08:00
Dan Walsh	e61c672aa7	Add missing man pages and bash completions for kpod ... We need to start off with man pages and bash completion support for kpod. Also fix Makefile to install kpod by default Signed-off-by: Dan Walsh <dwalsh@redhat.com>	2016-12-02 10:17:58 -05:00
Xianglin Gao	06cc0ba6ba	Add docs about apparmor profile setting ... Signed-off-by: Xianglin Gao <xlgao@zju.edu.cn>	2016-12-01 13:26:59 +08:00
Antonio Murdaca	78ee03a8fc	add seccomp support ... Signed-off-by: Antonio Murdaca <runcom@redhat.com>	2016-11-28 22:05:34 +01:00
HaoZhang	292b7e0034	update README.md and ocid.conf.5.md ... Signed-off-by: HaoZhang <crazykev@zju.edu.cn>	2016-10-25 01:08:17 +08: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
Aleksa Sarai	6860fe154a	docs: update documentation ... Add documentation for the new configuration file format, as well as the new `ocid config` subcommand and the changed --socket option. Signed-off-by: Aleksa Sarai <asarai@suse.de>	2016-10-11 21:21:59 +11:00
Dan Walsh	794aa221a8	Fix up man page with missing options ... Also sort options in alphabetic order. Signed-off-by: Dan Walsh <dwalsh@redhat.com>	2016-10-07 14:53:07 -04:00
Dan Walsh	f51c98b057	Install conmon in /usr/libexec/ocid/conmon ... Signed-off-by: Dan Walsh <dwalsh@redhat.com>	2016-09-29 08:55:12 -04:00
Dan Walsh	6e7e58e236	Add man page for ocid ... Signed-off-by: Dan Walsh <dwalsh@redhat.com>	2016-09-28 16:22:28 -04:00