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

Merge pull request #1465 from dsyer/master

Browse Source 
Clarify that plugin names are long in version = 2
This commit is contained in:
Wei Fu 2020-05-01 12:09:28 +08:00 committed by GitHub
commit 9c506d0af4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/config.md
View File

@ -10,6 +10,7 @@ The explanation and default value of each configuration item are as follows:
```toml ```toml
# Use config version 2 to enable new configuration fields. # Use config version 2 to enable new configuration fields.
# Config file is parsed as version 1 by default. # Config file is parsed as version 1 by default.
# Version 2 uses long plugin names, i.e. "io.containerd.grpc.v1.cri" vs "cri".
version = 2 version = 2
# The 'plugins."io.containerd.grpc.v1.cri"' table contains all of the server options. # The 'plugins."io.containerd.grpc.v1.cri"' table contains all of the server options.

2
docs/registry.md
View File

@ -6,6 +6,8 @@ With containerd, `docker.io` is the default image registry. You can also set up
To configure image registries create/modify the `/etc/containerd/config.toml` as follows: To configure image registries create/modify the `/etc/containerd/config.toml` as follows:
```toml ```toml
# Config file is parsed as version 1 by default.
# To use the long form of plugin names set "version = 2"
[plugins.cri.registry.mirrors] [plugins.cri.registry.mirrors]
[plugins.cri.registry.mirrors."docker.io"] [plugins.cri.registry.mirrors."docker.io"]
endpoint = ["https://registry-1.docker.io"] endpoint = ["https://registry-1.docker.io"]