Commit graph

92 commits

Author SHA1 Message Date
Antonio Murdaca
78ee03a8fc
add seccomp support
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-11-28 22:05:34 +01:00
Dan Walsh
80ef36ba2e Fix install of unit file and configuration file
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-10-31 13:44:18 -04:00
Mrunal Patel
5504b68c96 Merge pull request from cyphar/add-make-arguments
makefile: add make arguments
2016-10-31 10:24:49 -07:00
Dan Walsh
07b869ef0b Fix installation of ocid.systemd
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-10-31 10:43:46 -04:00
Aleksa Sarai
bb15f27eae
makefile: fix several issues and add arguments
The GO= arguments allow for cross-compilation without needing to symlink
over /usr/bin/go. Currently openSUSE uses go-5 for building on exotic
architectures. In addition, installdir options makes installation on
various distributions much easier, for example openSUSE doesn't have a
separate %{_libexecdir}.

Due to how Makefiles are parsed, we have to delay the expansion of the
$(wildcard ...) until the actual install target is being executed.

In addition, fix the oci{c,d} dependency lists so that we don't rebuild
oci{c,d} every time. Also remove "all" as a dependency of make install
-- this breaks building inside RPMs with custom ocid.conf files.

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-11-01 00:27:07 +11:00
Aleksa Sarai
f2f369f6f8
systemd: move ocid.service to contrib/
In addition, remove the installation steps from the Makefile. In
general, I personally don't like projects that install service files on
`make install` -- that's the job of a package manager.

Signed-off-by: Aleksa Sarai <asarai@suse.com>
2016-10-31 23:31:05 +11:00
Aleksa Sarai
d559b58fd4
makefile: fix binary dependencies
OCID_LINK is necessary to correctly build all of the binaries. This
syntax is a GNU Make-ism[1] that allows you to specify a path dependency
without rebuilding the target if the dependency is newer than the
target.

[1]: https://www.gnu.org/software/make/manual/html_node/Prerequisite-Types.html

Signed-off-by: Aleksa Sarai <asarai@suse.com>
2016-10-31 23:27:59 +11:00
Lai Jiangshan
09d470bdcd unistall or cleanup uncompressed manpages when requested
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-10-18 17:16:07 +08:00
Lai Jiangshan
9d65f8a907 don't gzip the manpages
let the package builders of the distros do it

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
2016-10-18 16:35:31 +08:00
Qiang Huang
f3bc6d3660 Makefile: fix remove docs in make clean
On Ubuntu, `/bin/sh` is used in Makefile by default, so
a.{1,2,3} isn't evaluated to a.1 a.2 a.3, another solution
is to use `SHELL=/bin/bash` in Makefile, but I don't think
we should bind to bash this early, at least not for this
case.

This also remove the removal of docs/*.1 which doesn't
exist for now.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
2016-10-17 13:15:41 +08:00
Dan Walsh
a14ddbde94 Fix up Makefile, to only build when needed
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2016-10-14 16:48:42 -04: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
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
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
Mrunal Patel
027aaf15b7 Merge pull request from rhatdan/selinux
Selinux
2016-10-06 12:28:12 -07: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
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
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
Aleksa Sarai
1313f0dd72
*: add pause binary as a build target
Take the pause binary's source code (from kubernetes/pause) and make it
part of the build setup for cri-o. This is necessary to remove the
Docker requirement for setting up the pause container, at least until
the storage API is set up so that we can make this far more flexible
(namely that we can pull the image from a registry or other transport,
even from an archive).

Signed-off-by: Aleksa Sarai <asarai@suse.de>
2016-10-02 19:36:39 +11: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
Antonio Murdaca
3199e0aae4
Makefile: install go-md2man
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-28 23:55:35 +02:00
Mrunal Patel
5a5be4b308 Merge pull request from rhatdan/master
Add man page for ocid
2016-09-28 14:30:13 -07: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
741873adbe
Makefile: suggests install.tools
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-28 20:53:29 +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
560b0a6a9b
Makefile: pass $TRAVIS env to tests
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-27 10:51:35 +02:00
Antonio Murdaca
5a922dbdf6
Makefile: fix .gitvalidation
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-27 10:43:06 +02:00
Mrunal Patel
4606f2a61a Fix the build for ocid to cri-o rename
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-26 16:55:12 -07:00
Antonio Murdaca
3d289bd214
Makefile: add TESTFLAGS to test targets
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-24 09:59:29 +02:00
Antonio Murdaca
614e33e3d0
Makefile: fix link target
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-24 00:38:06 +02:00
Antonio Murdaca
c11bf15e83
Makefile: install tools in system's gopath
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-24 00:38:06 +02:00
Antonio Murdaca
5fb0252fd2
add tests skeleton
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-24 00:37:07 +02:00
Antonio Murdaca
ec173002fd
cmd/client: split commands in multiple files
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-24 00:31:46 +02:00
Antonio Murdaca
6f75277d00
some cleanups
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-22 18:17:45 +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
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
4bc8701fc0
*: switch from godep to glide
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2016-09-17 17:06:30 +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
Mrunal Patel
7931cc4f4e Fix make for the command
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-09 14:41:03 -07:00
Mrunal Patel
4c17d44c5a Add a start Makefile to build ocid/ocic
Signed-off-by: Mrunal Patel <mrunalp@gmail.com>
2016-09-09 14:41:03 -07:00