vbatts/cri-o
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge pull request #406 from mrunalp/fixup_prereqs

Browse source 
Cleanup prerequisites section in README.md
This commit is contained in:
Antonio Murdaca 2017-03-24 22:03:33 +01:00 committed by GitHub
commit a752a72ee0
2 changed files with 17 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Makefile
View file

@ -101,13 +101,13 @@ MANPAGES_MD := $(wildcard docs/*.md)
MANPAGES := $(MANPAGES_MD:%.md=%) MANPAGES := $(MANPAGES_MD:%.md=%)
docs/%.1: docs/%.1.md check-gopath docs/%.1: docs/%.1.md check-gopath
go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@ $(GOPATH)/bin/go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@
docs/%.5: docs/%.5.md check-gopath docs/%.5: docs/%.5.md check-gopath
go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@ $(GOPATH)/bin/go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@
docs/%.8: docs/%.8.md check-gopath docs/%.8: docs/%.8.md check-gopath
go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@ $(GOPATH)/bin/go-md2man -in $< -out $@.tmp && touch $@.tmp && mv $@.tmp $@
docs: $(MANPAGES) docs: $(MANPAGES)
@ -163,14 +163,14 @@ endif
install.tools: .install.gitvalidation .install.gometalinter .install.md2man install.tools: .install.gitvalidation .install.gometalinter .install.md2man
.install.gitvalidation: .install.gitvalidation: check-gopath
go get -u github.com/vbatts/git-validation go get -u github.com/vbatts/git-validation
.install.gometalinter: .install.gometalinter: check-gopath
go get -u github.com/alecthomas/gometalinter go get -u github.com/alecthomas/gometalinter
gometalinter --install $(GOPATH)/bin/gometalinter --install
.install.md2man: .install.md2man: check-gopath
go get -u github.com/cpuguy83/go-md2man go get -u github.com/cpuguy83/go-md2man
.PHONY: \ .PHONY: \

16
README.md
View file

@ -43,14 +43,18 @@ It is currently in active development in the Kubernetes community through the [d
### Build ### Build
`btrfs-progs-devel`, `device-mapper-devel`, `glib2-devel`, `glibc-devel`, `glibc-static`, `gpgme-devel`, `libassuan-devel`, `libgpg-error-devel`, and `pkgconfig` packages on CentOS/Fedora or `btrfs-tools`, `libassuan-dev`, `libc6-dev`, `libdevmapper-dev`, `libglib2.0-dev`, `libgpg-error-dev`, `libgpgme11-dev`, and `pkg-config` on Ubuntu or equivalent is required. On Fedora/Centos/RHEL:
In order to enable seccomp support you will need to install development files for `libseccomp` on your platform. ```bash
> e.g. `libseccomp-devel` for CentOS/Fedora, or `libseccomp-dev` for Ubuntu dnf install -y btrfs-progs-devel device-mapper-devel libseccomp-devel glib2-devel glibc-devel glibc-static gpgme-devel libassuan-devel libgpg-error-devel pkgconfig libselinux-devel
In order to enable apparmor support you will need to install development files for `libapparmor` on your platform. ```
> e.g. `libapparmor-dev` for Ubuntu
On Ubuntu/Debian:
```bash
apt install btrfs-tools libassuan-dev libc6-dev libdevmapper-dev libglib2.0-dev libgpg-error-dev libgpgme11-dev pkg-config libseccomp-dev libapparmor-dev
```
```bash ```bash
$ GOPATH=/path/to/gopath $ export GOPATH=~/go
$ mkdir $GOPATH $ mkdir $GOPATH
$ go get -d github.com/kubernetes-incubator/cri-o $ go get -d github.com/kubernetes-incubator/cri-o
$ cd $GOPATH/src/github.com/kubernetes-incubator/cri-o $ cd $GOPATH/src/github.com/kubernetes-incubator/cri-o