Commit graph

1138 commits

Author SHA1 Message Date
Antonio Murdaca
26262dff00 Merge pull request from mrunalp/makefile_fixes
Fixes to the Makefile
2016-09-19 20:45:03 +02:00
Mrunal Patel
94cca5636c Fixes to the Makefile
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-19 11:36:57 -07:00
Mrunal Patel
fd265ef527 Merge pull request from runcom/restore-sandboxes
sandboxes restore on server start
2016-09-19 11:10:26 -07:00
Antonio Murdaca
b053e63995
restore server rewrite
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-19 19:57:50 +02:00
Antonio Murdaca
22d434c1e6
restructure and make lint
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-19 19:56:13 +02:00
Antonio Murdaca
aa748b62b2
makefile stuff
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-19 19:51:03 +02:00
Antonio Murdaca
53e76cc752
warn when cannot update container status on server init
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-19 19:51:03 +02:00
Antonio Murdaca
260a7adb83
server/runtime: store sandbox id in container's annotations
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-19 19:51:03 +02:00
Antonio Murdaca
caae4b298a
create sandboxdir on server startup
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-19 19:51:03 +02:00
Antonio Murdaca
99a086420b
testdata: update container_config to be usable
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-19 19:51:03 +02:00
Antonio Murdaca
4fd1c583ad
sandboxes restore on server start
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-19 19:51:03 +02:00
Mrunal Patel
87a15ecd42 Merge pull request from runcom/inmemory-store
use an in memory store for containers
2016-09-19 10:50:19 -07:00
Antonio Murdaca
35ef46f805
use an in memory store for containers
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-19 13:11:36 +02:00
Mrunal Patel
7fc874e05e Merge pull request from runcom/typos-errs
*: Failed -> failed in errors
2016-09-18 09:17:13 -07:00
Antonio Murdaca
59aae8cdb5
*: Failed -> failed in errors
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-18 11:38:14 +02:00
Mrunal Patel
5e672974ff Merge pull request from runcom/debug-logrus
server: add debug to ocid
2016-09-17 13:19:20 -07:00
Mrunal Patel
7d762bf015 Merge pull request from runcom/hacking-md
*: add HACKING.md
2016-09-17 12:58:24 -07:00
Antonio Murdaca
4751d054c4
*: add HACKING.md
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-17 18:53:36 +02:00
Antonio Murdaca
d626a32c56
server: add debug to ocid
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-17 17:30:00 +02:00
Mrunal Patel
f99be8417e Merge pull request from runcom/use-glide
*: switch from godep to glide
2016-09-17 08:22:04 -07:00
Antonio Murdaca
4bc8701fc0
*: switch from godep to glide
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-17 17:06:30 +02:00
Mrunal Patel
0d7b500cee Merge pull request from runcom/locks
server: locking around server components
2016-09-17 08:04:02 -07:00
Mrunal Patel
6007176ec9 Merge pull request from runcom/fix2
Various fixes
2016-09-17 08:02:45 -07:00
Mrunal Patel
18fee478aa Merge pull request from runcom/fix-testdata-readme
testdata/README.md: fix examples
2016-09-17 07:51:47 -07:00
Antonio Murdaca
df43d39807
testdata/README.md: fix examples
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-17 16:12:43 +02:00
Antonio Murdaca
158dfdfbda
server: locking around server components
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-17 16:10:35 +02:00
Antonio Murdaca
d1510cb854
.gitignore: add conmon objs
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-17 11:56:51 +02:00
Antonio Murdaca
4a4897bbfe
conmon: use runtime path from ocid
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-17 11:37:45 +02:00
Antonio Murdaca
2d8691cb0a
server: remove podsandbox on failure
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-17 11:37:20 +02:00
Antonio Murdaca
66fdf3ae21 Merge pull request from mrunalp/finish_status
Report exit code and finish time on container status
2016-09-17 09:31:08 +02:00
Mrunal Patel
09116a4998 Remove "compliant" from README
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-16 16:35:25 -07:00
Mrunal Patel
f7f02009c2 Report exit code and finish time on container status
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-16 16:33:33 -07:00
Antonio Murdaca
91bd12ed24 Merge pull request from mrunalp/conmon_integration
Conmon integration
2016-09-16 09:29:22 +02:00
Mrunal Patel
02236bbda0 Integrate conmon into ocid
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-15 16:40:44 -07:00
Mrunal Patel
e48b274c35 Merge pull request from sjpotter/master
make socket location configurable on cmd line
2016-09-15 16:04:40 -07:00
Shaya Potter
3c0485dd71 make socket location configurable on cmd line 2016-09-15 15:57:39 -07:00
Mrunal Patel
6e05f772ed Add a property to track whether a container needs terminal
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-15 15:01:39 -07:00
Antonio Murdaca
0681d5d94b Merge pull request from mrunalp/init_state
Update state after creating container
2016-09-13 23:04:56 +02:00
Antonio Murdaca
0652579fb0 Merge pull request from mrunalp/state_lock
Add lock around container state access
2016-09-13 23:04:26 +02:00
Mrunal Patel
1f01486600 Add lock around container state access
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-13 13:58:25 -07:00
Mrunal Patel
61ae296fe9 Update state after creating container
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-13 13:51:29 -07:00
Mrunal Patel
817b22b5f3 Merge pull request from mrunalp/opt_parsing
Separate tty/non-tty and add opt parsing
2016-09-13 09:56:21 -07:00
Antonio Murdaca
adc979c765 Merge pull request from kubernetes-incubator/smarterclayton-patch-1
Update readme with a bit more info
2016-09-13 17:59:04 +02:00
Clayton Coleman
f0edbb48f0 Update readme with a bit more info 2016-09-13 11:55:45 -04:00
Antonio Murdaca
6004dcd73b Merge pull request from mrunalp/status_started
Add started time and state to container status
2016-09-13 08:04:08 +02:00
Mrunal Patel
a7ca60ae30 Separate tty/non-tty and add opt parsing
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-12 16:38:30 -07:00
Mrunal Patel
819db7d8cc Return the started time and ctr state with ctr status
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-12 15:43:30 -07:00
Mrunal Patel
0741159ce8 Set the started time for a container
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-12 15:43:11 -07:00
Mrunal Patel
b145b16ac0 Merge pull request from mrunalp/ctr_status
Support for container status
2016-09-12 15:18:15 -07:00
Mrunal Patel
1dc98efdcf Add client support for container status
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-12 15:03:26 -07:00