vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity
474 commits 7 branches 27 tags 53 MiB
Commit graph

474 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Mike Brown
f1f35ce870 mention make docs; describe how to recover from bad sandbox data 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2016-10-11 11:30:32 -05:00
Crazykev
f6536bf30e pod/container name should be released when create failed 
Signed-off-by: Crazykev <crazykev@zju.edu.cn>
 2016-10-11 20:19:51 +08: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
Aleksa Sarai
9fb23bf0dc
ocid: add config subcommand 
This subcommand is so that users can get a nice commented version of the
ocid configuration file. This comes from the "current" version of the
configuration (allowing somone to get their custom configuration as a
file). It also has a --default option.

In addition, update the tests to use `ocid config` so that we test this
setup (the loading and saving of the options).

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-11 21:21:58 +11:00
Aleksa Sarai
cd9e7de108
ocid: add TOML configuration file 
The --config is merged with the default, and then is overridden by any
command-line options. Everything is organised to be in sub-tables so
that the sections are more clear.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-11 03:10:32 +11:00
Aleksa Sarai
7bf5110b76
server: refactor to use Config struct 
This paves the way for having a configuration file that is loaded rather
than everything being set via the command-line.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-11 03:10:32 +11:00
Aleksa Sarai
3f48986ea0
cmd: switch to --connect and --listen flags 
Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-11 03:09:59 +11:00
Aleksa Sarai
316e85f0b4
vendor: add BurntSushi/toml@v0.2.0 
The tag points at bbd5bb678321a0d6e58f1099321dfa73391c1b6f.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
 2016-10-11 03:09:59 +11:00
Mrunal Patel
96cc03ccd9 Merge pull request #114 from runcom/containers-restore 
server: containers restore
 2016-10-10 08:43:39 -07:00
Antonio Murdaca
9b72f29b72
fixups for tests 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-08 14:57:45 +02:00
Antonio Murdaca
cfa4a341a6
server/container: fix bug when listing container IDs 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-08 14:55:25 +02:00
Antonio Murdaca
217d278623
server/server: check pods/ctrs directories before restore 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-08 14:46:39 +02:00
Antonio Murdaca
a2fe83fe56
cmd/client/container: add --quiet to ctr list 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-08 14:46:39 +02:00
Antonio Murdaca
e0364ec633
add containers restore test 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-08 14:46:39 +02:00
Antonio Murdaca
30757221b4
cmd/client/sandbox: add --quiet to pod list 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-08 14:46:39 +02:00
Antonio Murdaca
54d6ddb5af
server: containers restore 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-08 14:46:39 +02:00
Mrunal Patel
cc732301ac Merge pull request #119 from rhatdan/selinux 
Fix up man page with missing options
 2016-10-07 14:01:05 -05: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
Antonio Murdaca
0cf8daa786 Merge pull request #118 from mrunalp/ctr_name 
Allow overriding the container name in the config
 2016-10-07 20:49:39 +02:00