Commit graph

1585 commits

Author SHA1 Message Date
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
Antonio Murdaca
138b8cce54 Merge pull request #105 from mrunalp/ctr_create_cleanup
Cleanup container directory and state on creation failure
2016-10-06 20:20:13 +02:00
Dan Walsh
be77b841fa Add SELinux support to OCID
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-10-06 14:13:06 -04:00
Mrunal Patel
0321870568 Cleanup container directory and state on creation failure
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-10-06 11:12:39 -07:00
Antonio Murdaca
080394d3c3 Merge pull request #104 from mikebrow/make-install-dep-change
remove install dependencies so they don't build
2016-10-06 18:57:57 +02:00
Mike Brown
7d3cf31c51 remove install dependencies so they don't build
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2016-10-06 11:32:31 -05:00
Mrunal Patel
f273a10240 Merge pull request #103 from mikebrow/path-to-runc
small amount of error checking and help for path to the runtime
2016-10-06 09:32:11 -07:00
Mike Brown
609d7630ca small amount of error checking and help for path to the runtime
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2016-10-06 11:14:54 -05:00
Mrunal Patel
c2e9f31491 Merge pull request #99 from mikebrow/add-installtools-toreadme
mention the need to add install tools
2016-10-05 20:16:11 -07:00
Mrunal Patel
308cc4a3b5 Update vendor to use libcontainer/label
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-10-05 21:58:10 -04:00
Mrunal Patel
fa7945193d Merge pull request #98 from mikebrow/makefile-issue-on-ubuntu
fixes issue with ubuntu build
2016-10-05 18:11:12 -07:00
Mike Brown
18df9788de mention the need to add install tools
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2016-10-05 20:05:35 -05:00
Mike Brown
cddafb00b3 fixes issue with ubuntu build
Signed-off-by: Mike Brown <brownwm@us.ibm.com>
2016-10-05 19:55:07 -05:00
Antonio Murdaca
a5da8a4d1e Merge pull request #97 from mrunalp/ctr_dir_id
Use container ID as the directory name
2016-10-05 23:02:25 +02:00
Antonio Murdaca
5d16d7f883 Merge pull request #96 from mrunalp/ctr_short_ids
Add support for short IDs for containers
2016-10-05 23:00:52 +02:00
Mrunal Patel
e82426fa8f Use container ID as the directory name
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-10-05 12:18:56 -07:00
Mrunal Patel
869f85e4bb Add support for specifying container short IDs
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-10-05 11:55:45 -07:00
Mrunal Patel
edba913f67 Track container IDs in index
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-10-05 11:31:41 -07:00
Antonio Murdaca
e9ab839955 Merge pull request #67 from mrunalp/getting_started
[readme] Add intructions for getting started
2016-10-05 08:15:07 +02:00
Antonio Murdaca
65b94fb028 Merge pull request #94 from mrunalp/ctr_meta
Refactor to separate container IDs from container names
2016-10-05 08:14:06 +02:00
Mrunal Patel
0482a4281a Separate container IDs from container names
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-10-04 16:57:12 -07:00
Mrunal Patel
484719c8fe Add a function to generate container id and name
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-10-04 16:15:23 -07:00