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

Change path of CNI build script and pin to a commit

Browse source 
As of containernetworking/cni commit 1b9caefba5670c59e0ccbf0b008d88da52a7d498,
the script to build has changed from 'build' to 'build.sh' which broke our
integration tests. Change the integration test Dockerfile to update this path,
and update the tutorial for good measure. Pin to current master to ensure this
breakage doesn't happen again.

Signed-off-by: Matthew Heon <mheon@redhat.com>
This commit is contained in:
Matthew Heon 2017-04-05 12:53:17 -04:00
parent 09d2a6b519
commit 517f43ce19
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" && rm -rf "$GOPATH"
# Install CNI plugins # Install CNI plugins
ENV CNI_COMMIT d4bbce1865270cd2d2be558d6a23e63d314fe769
RUN set -x \ RUN set -x \
&& export GOPATH="$(mktemp -d)" \ && export GOPATH="$(mktemp -d)" \
&& git clone https://github.com/containernetworking/cni.git "$GOPATH/src/github.com/containernetworking/cni" \ && git clone https://github.com/containernetworking/cni.git "$GOPATH/src/github.com/containernetworking/cni" \
&& cd "$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 \ && mkdir -p /opt/cni/bin \
&& cp bin/* /opt/cni/bin/ \ && cp bin/* /opt/cni/bin/ \
&& rm -rf "$GOPATH" && rm -rf "$GOPATH"

2
tutorial.md
View file

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