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

356 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Antonio Murdaca
7c6eb77224 Merge pull request #110 from mrunalp/pod_meta 
Return pod metadata in pod list and status APIs
 2016-10-07 20:44:40 +02:00
Mrunal Patel
d916b586c8 Allow overriding the container name in the config 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-10-07 13:42:08 -05:00
Mrunal Patel
7c0a441c4b Display pod metadata on the client for list and status 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-10-07 13:32:33 -05:00
Mrunal Patel
1af5ca53c4 Merge pull request #116 from mikebrow/readme_test_redis-data 
removing mount from container_redis
 2016-10-07 10:40:47 -07:00
Mike Brown
5ac01ec8f3 removing mount from test/testdata/container_redis.json 
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
 2016-10-07 12:32:11 -05:00
Antonio Murdaca
356e5f3c22 Merge pull request #112 from rhatdan/selinux 
Can't use SELinux separation when sharing the host pid or ipc namespace
 2016-10-07 13:43:55 +02:00
Antonio Murdaca
8601a70a39 Merge pull request #90 from alobbs/fix-89 
Ports conmon from getopt() to glib's parsing mechanism
 2016-10-07 13:42:51 +02:00
Dan Walsh
cd12a4acfe Can't use SELinux separation when sharing the host pid/ipc namespace 
SELinux will cause breakage when sharing these namespaces.  For example it
will block processes inside of the container from looking at the hosts /proc
in hosts Pid Namespace.  It will also block all access to semaphores and
shared memory defined outside of the pod.

Signed-off-by: Dan Walsh <dwalsh@redhat.com>
 2016-10-07 07:28:12 -04:00
Antonio Murdaca
fbcd609644 Merge pull request #109 from mrunalp/get_sb 
Refactor to use helper method to get sandbox from request
 2016-10-07 09:44:00 +02:00
Antonio Murdaca
31ad011fc4 Merge pull request #108 from mrunalp/ctr_state_fixes 
Container state fixes
 2016-10-07 09:42:38 +02:00
Mrunal Patel
d1198fc75b Populate pod metadata in pod list and status APIs 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-10-06 16:51:13 -07:00
Mrunal Patel
d7e72cb3a2 Refactor to use helper method get sandbox object 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-10-06 15:34:05 -07:00
Mrunal Patel
ec0b27fffc Add a helper method to get sandbox from request 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-10-06 15:34:05 -07:00
Mrunal Patel
77afd34a27 Container state fixes 
Move Container State constants to oci package
and fixup where strings were used instead of
the status constants

Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-10-06 15:16:21 -07:00
Antonio Murdaca
9b42de99d1 Merge pull request #106 from mrunalp/get_ctr 
Refactor to use helper for getting Container
 2016-10-06 23:34:06 +02:00
Mrunal Patel
f6a12b865c Refactor to use new helper method to get Container 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-10-06 12:49:59 -07:00
Mrunal Patel
a56cbb4117 Add a helper to get container from request 
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
 2016-10-06 12:49:04 -07:00
Mrunal Patel
027aaf15b7 Merge pull request #100 from rhatdan/selinux 
Selinux
 2016-10-06 12:28:12 -07:00