Skip to content

Commit 282b900

Browse files
committed
test/README: Update the CNI plugins instructions for /cni -> /plugins
Catching up with the Dockerfile change from f51b0a1 (Dockerfile: move to containernetworking/plugins, 2017-05-25, cri-o#536). The new plugins commit from f51b0a1 is still the current Dockerfile entry. This commit also replaces the previous 'go get' call with a git clone to match the Dockerfile's approach. I've added an additional 'cd' call so I don't have to repeat $GOPATH/... more than once, but other than that, the example matches the current Dockerfile entry. I've also removed some line-continuation slashes we've been dragging around since the section landed 07ccda3 (tests: Install CNI configuration files by default, 2017-04-06, cri-o#434). I'm guessing they were a copy/paste bug from the Dockerfile, but this example has new prompts for each command (so it doesn't need continuation) while the Dockerfile is using && chaining (so it does). Signed-off-by: W. Trevor King <[email protected]>
1 parent ba2b4a0 commit 282b900

File tree

1 file changed

+6
-5
lines changed

1 file changed

+6
-5
lines changed

test/README.md

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,12 @@ You will also need to install the [CNI](https://github.com/containernetworking/c
4141
the the default pod test template runs without host networking:
4242

4343
```
44-
$ go get github.com/containernetworking/cni
45-
$ cd "$GOPATH/src/github.com/containernetworking/cni"
46-
$ git checkout -q d4bbce1865270cd2d2be558d6a23e63d314fe769
47-
$ ./build.sh \
48-
$ mkdir -p /opt/cni/bin \
44+
$ cd "$GOPATH/src/github.com/containernetworking"
45+
$ git clone https://github.com/containernetworking/plugins.git
46+
$ cd plugins
47+
$ git checkout -q dcf7368eeab15e2affc6256f0bb1e84dd46a34de
48+
$ ./build.sh
49+
$ mkdir -p /opt/cni/bin
4950
$ cp bin/* /opt/cni/bin/
5051
```
5152

0 commit comments

Comments
 (0)