github/containerd
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 2 Wiki Activity

Merge pull request #6276 from sachaos/feature/fix-wrong-document-about-make-install-deps

Browse Source 
Fix wrong make target on documentation
This commit is contained in:
Phil Estes 2021-11-22 16:50:07 -05:00 committed by GitHub
commit 51e60404ae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
docs/cri/crictl.md
View File

@ -15,7 +15,7 @@ should have installed crictl for you. If not, get it from your release tarball.
If you are a developer the current version of crictl is specified [here](/script/setup/critools-version). If you are a developer the current version of crictl is specified [here](/script/setup/critools-version).
A helper command has been included to install the dependencies at the right version: A helper command has been included to install the dependencies at the right version:
```console ```console
$ make install.deps $ make install-deps
``` ```
* Note: The file named `/etc/crictl.yaml` is used to configure crictl * Note: The file named `/etc/crictl.yaml` is used to configure crictl
so you don't have to repeatedly specify the runtime sock used to connect crictl so you don't have to repeatedly specify the runtime sock used to connect crictl

2
integration/image_load_test.go
View File

@ -58,7 +58,7 @@ func TestImageLoad(t *testing.T) {
t.Logf("load image in cri") t.Logf("load image in cri")
ctr, err := exec.LookPath("ctr") ctr, err := exec.LookPath("ctr")
require.NoError(t, err, "ctr should be installed, make sure you've run `make install.deps`") require.NoError(t, err, "ctr should be installed, make sure you've run `make install-deps`")
output, err = exec.Command(ctr, "-address="+containerdEndpoint, output, err = exec.Command(ctr, "-address="+containerdEndpoint,
"-n=k8s.io", "images", "import", tar).CombinedOutput() "-n=k8s.io", "images", "import", tar).CombinedOutput()
require.NoError(t, err, "output: %q", output) require.NoError(t, err, "output: %q", output)