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

Merge pull request #3934 from AkihiroSuda/ctr-address-env

Browse Source 
ctr: support $CONTAINERD_ADDRESS env var
This commit is contained in:
Phil Estes 2020-01-07 09:14:48 -05:00 committed by GitHub
commit da2890a908
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
cmd/ctr/app/main.go
View File

@ -81,6 +81,7 @@ containerd CLI
Name: "address, a", Name: "address, a",
Usage: "address for containerd's GRPC server", Usage: "address for containerd's GRPC server",
Value: defaults.DefaultAddress, Value: defaults.DefaultAddress,
EnvVar: "CONTAINERD_ADDRESS",
}, },
cli.DurationFlag{ cli.DurationFlag{
Name: "timeout", Name: "timeout",

5
docs/rootless.md
View File

@ -33,9 +33,10 @@ state = "/run/user/1001/containerd"
A client program such as `ctr` also needs to be executed inside the daemon namespaces. A client program such as `ctr` also needs to be executed inside the daemon namespaces.
```console ```console
$ nsenter -U --preserve-credentials -m -n -t $(cat /run/user/1001/rootlesskit-containerd/child_pid) $ nsenter -U --preserve-credentials -m -n -t $(cat /run/user/1001/rootlesskit-containerd/child_pid)
$ export CONTAINERD_ADDRESS=/run/user/1001/containerd/containerd.sock
$ export CONTAINERD_SNAPSHOTTER=native $ export CONTAINERD_SNAPSHOTTER=native
$ ctr -a /run/user/1001/containerd/containerd.sock pull docker.io/library/ubuntu:latest $ ctr images pull docker.io/library/ubuntu:latest
$ ctr -a /run/user/1001/containerd/containerd.sock run -t --rm --fifo-dir /tmp/foo-fifo --cgroup "" docker.io/library/ubuntu:latest foo $ ctr run -t --rm --fifo-dir /tmp/foo-fifo --cgroup "" docker.io/library/ubuntu:latest foo
``` ```
* `overlayfs` snapshotter does not work inside user namespaces, except on Ubuntu kernel * `overlayfs` snapshotter does not work inside user namespaces, except on Ubuntu kernel