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

ctr: support $CONTAINERD_ADDRESS env var

Browse Source 
`$CONTAINERD_ADDRESS` can be specified instead of the `ctr --address` flag.

Signed-off-by: Akihiro Suda <akihiro.suda.cz@hco.ntt.co.jp>
This commit is contained in:
Akihiro Suda 2020-01-07 15:59:12 +09:00
parent b9fad5e310
commit b127b666aa
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -78,9 +78,10 @@ containerd CLI
Usage: "enable debug output in logs", Usage: "enable debug output in logs",
}, },
cli.StringFlag{ cli.StringFlag{
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