Commit graph

1777 commits

Author SHA1 Message Date
Aleksa Sarai
498d2d602e
test: add more debugging output
In several places, we previously didn't output the $output of the
failing command, leading to confusion when debugging. A proper fix is to
alias oci{c,d} in helpers.sh like runC does, but that can come later.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-10-02 19:13:00 +11:00
Mrunal Patel
37affbfd7a Merge pull request #88 from alobbs/fix-87
Fixes Makefile so CFLAGS/LIBS are accepted as a make parameter
2016-10-01 12:40:29 -07:00
Alvaro Lopez Ortega
fe086ff7e0 Ports conmon from getopt() to glib's parsing mechanism
conmon uses getopt() even if it's a glib based application,
and therefore could use the much more modern and flexible
GOptionContext mechanism. Fixes #89

Signed-off-by: Alvaro Lopez Ortega <alvaro@gnu.org>
2016-09-30 23:26:29 -04:00
Alvaro Lopez Ortega
54b862f86f Fixes Makefile so CFLAGS/LIBS are accepted as a make parameter
It should be possible to run make with compilation CFLAGS / LIBS
paramaters. For instance, 'make CFLAGS="-g3 -O0"'. Fixes #87

Signed-off-by: Alvaro Lopez Ortega <alvaro@gnu.org>
2016-09-30 22:15:30 -04:00
Mrunal Patel
a6f52b83dc [readme] Add intructions for getting started
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-30 16:20:34 -07:00
Antonio Murdaca
3697a61db9 Merge pull request #84 from mrunalp/pod_attempt
Include attempt in the pod name
2016-10-01 01:06:00 +02:00
Antonio Murdaca
e8405a4eec Merge pull request #85 from mrunalp/pod_annotations
Add annotations for pods
2016-10-01 01:05:06 +02:00
Mrunal Patel
d5a8d1bae3 Add annotations for pods
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-30 15:48:31 -07:00
Mrunal Patel
581c17169c Include attempt in the pod name
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-30 15:23:38 -07:00
Antonio Murdaca
b0e23c4a24 Merge pull request #83 from mrunalp/ctr_list_fix
Remove containers from in-memory state on pod remove
2016-09-30 22:16:37 +02:00
Mrunal Patel
23858b7ed6 Add pod list and ctr list calls to ctr lifecycle test
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-30 12:24:16 -07:00
Mrunal Patel
50bea08c50 Remove containers from state on pod remove
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-30 12:23:48 -07:00
Antonio Murdaca
8fe5343e8b Merge pull request #80 from mrunalp/ctr_lifecycle_test
Add container lifecycle test
2016-09-29 22:43:17 +02:00
Mrunal Patel
a2c2d0d6f1 Add container lifecycle test
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-29 13:33:47 -07:00
Antonio Murdaca
c6a52a1b93 Merge pull request #77 from rhatdan/conmon
Conmon should not be installed in /usr/bin.
2016-09-29 15:05:47 +02: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
Mrunal Patel
47c993f2e1 Merge pull request #79 from runcom/docs-tweaks
Docs tweaks
2016-09-28 15:05:07 -07:00
Antonio Murdaca
57e0d9a8ad
.travis.yml: enable make docs
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-28 23:55:50 +02:00
Antonio Murdaca
3199e0aae4
Makefile: install go-md2man
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-28 23:55:35 +02:00
Antonio Murdaca
68c6e4b4ff
.gitignore: ignore generated docs
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-28 23:54:38 +02:00
Mrunal Patel
5a5be4b308 Merge pull request #69 from rhatdan/master
Add man page for ocid
2016-09-28 14:30:13 -07:00
Antonio Murdaca
ffb2fe8f52 Merge pull request #78 from jawnsy/topics/update-readme-badges
Add badge for Go Report Card
2016-09-28 23:08:17 +02:00
Jonathan Yu
1471045353 Add badge for Go Report Card
This also changes the badges to be flat, and moves them down to
allow more room for future badges.

Signed-off-by: Jonathan Yu <jawnsy@redhat.com>
2016-09-28 13:52:50 -07:00
Antonio Murdaca
78a91f6c66 Merge pull request #76 from mrunalp/pod_remove_stop
Pod remove stop
2016-09-28 22:23:29 +02: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
Antonio Murdaca
6f064249e5 Merge pull request #74 from jawnsy/topics/build-go-tip
(WIP) Build with "tip" version of Golang
2016-09-28 22:22:15 +02:00
Mrunal Patel
c647c908a2 Add a test for pod remove
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-28 13:15:57 -07:00
Mrunal Patel
1b3d172377 Ensure containers are stopped on RemovePod
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-28 13:12:38 -07:00
Jonathan Yu
1a296ecf35 Build with "tip" version of Golang
This will give us early warning of changes in upstream Golang that
may affect us.

Signed-off-by: Jonathan Yu <jawnsy@redhat.com>
2016-09-28 13:11:41 -07:00
Mrunal Patel
5490399a5e Merge pull request #73 from jawnsy/topics/travis-remove-redundant-steps
(WIP) Remove redundant build steps
2016-09-28 13:04:38 -07:00
Antonio Murdaca
17ae9d5d01 Merge pull request #72 from mrunalp/ctr_remove_stop
Stop container first if it is running on RemoveContainer
2016-09-28 22:03:57 +02:00
Jonathan Yu
9bd9a33ca4 Remove redundant build steps
`make install.tools` already installs `gometalinter` (as can be seen in
the logs), so the subsequent `go get` steps are unnecessary.

This change also reorders the build directives according to execution
order: https://docs.travis-ci.com/user/customizing-the-build#The-Build-Lifecycle
and replaces the "before_install" step with an override of the default
"install" procedure (which we were suppressing anyway with install: true)

Signed-off-by: Jonathan Yu <jawnsy@redhat.com>
2016-09-28 12:57:20 -07:00
Mrunal Patel
52ff9e46dc Add a test for ctr remove
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-28 12:54:57 -07:00
Antonio Murdaca
8d445fc4ca Merge pull request #71 from mrunalp/remove_sleep
Remove unnecessary sleep from tests
2016-09-28 21:27:58 +02:00
Mrunal Patel
72ac4fe33e Stop container first if it is running on RemoveContainer
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-28 12:24:12 -07:00
Mrunal Patel
189b642908 Remove unnecessary sleep from tests
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-28 12:16:10 -07:00
Antonio Murdaca
7e2460ad73 Merge pull request #70 from runcom/gometalinter
Makefile: suggests install.tools
2016-09-28 21:02:31 +02:00
Antonio Murdaca
741873adbe
Makefile: suggests install.tools
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-28 20:53:29 +02:00
Antonio Murdaca
f46888f429 Merge pull request #66 from mrunalp/make_install
[make] Add install and uninstall targets
2016-09-28 19:24:09 +02:00
Mrunal Patel
db203c5f42 [make] Add install and uninstall targets
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-28 10:08:56 -07:00
Antonio Murdaca
4f80ffd1a2 Merge pull request #65 from mrunalp/ctr_list
List containers
2016-09-28 08:49:18 +02:00
Mrunal Patel
953f2e9f3b Add client impl for listing containers
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-27 15:17:56 -07:00
Mrunal Patel
e47189c148 Add server impl for listing containers
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-27 15:17:41 -07:00
Antonio Murdaca
11e675cb9d Merge pull request #64 from mrunalp/rename_readme
Rename OCID to cri-o in the README
2016-09-27 21:27:03 +02:00
Mrunal Patel
2378800c9d Rename OCID to cri-o in the README
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-27 12:16:40 -07:00
Antonio Murdaca
a56aa11aa8 Merge pull request #63 from mrunalp/fix_ctr_stop
Fix ctr stop
2016-09-27 21:01:48 +02:00
Mrunal Patel
fd91998ef3 Fix the test by removing sleep and ensuring cleanup
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-27 11:46:16 -07:00
Mrunal Patel
89c051f81f Make sure that the container stops when StopContainer API is called
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-27 11:46:05 -07:00
Mrunal Patel
03d989da4f Update vendors to inclue golang.org/x/sys
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-27 11:34:45 -07:00
Mrunal Patel
6d3531c19e Merge pull request #62 from runcom/fix-travis-badge
README.md: fix Travis badge
2016-09-27 09:42:39 -07:00