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

Merge pull request #428 from mheon/update_cni_buildpath

Browse source 
Change path of CNI build script
This commit is contained in:
Mrunal Patel 2017-04-05 16:06:02 -07:00 committed by GitHub
commit 4247f68764
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Dockerfile
View file

@ -56,11 +56,13 @@ RUN set -x \
&& rm -rf "$GOPATH"
# Install CNI plugins
ENV CNI_COMMIT d4bbce1865270cd2d2be558d6a23e63d314fe769
RUN set -x \
&& export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containernetworking/cni.git "$GOPATH/src/github.com/containernetworking/cni" \
&& cd "$GOPATH/src/github.com/containernetworking/cni" \
&& ./build \
&& git checkout -q "$CNI_COMMIT" \
&& ./build.sh \
&& mkdir -p /opt/cni/bin \
&& cp bin/* /opt/cni/bin/ \
&& rm -rf "$GOPATH"

2
tutorial.md
View file

@ -207,7 +207,7 @@ cd $GOPATH/src/github.com/containernetworking/cni
Build the `cni` binaries:
```
./build
./build.sh
```
Output: