Merge pull request #3574 from mxpv/cfg

Support config imports

docs/man/containerd-config.toml.5.md

@@ -32,6 +32,14 @@ settings.
 **oom_score**
 : The out of memory (OOM) score applied to the containerd daemon process (Default: 0)
 
+**imports**
+: Imports is a list of additional configuration files to include.
+This allows to split the main configuration file and keep some sections
+separately (for example vendors may keep a custom runtime configuration in a
+separate file without modifying the main `config.toml`).
+Imported files will overwrite simple fields like `int` or
+`string` (if not empty) and will append `array` and `map` fields.
+
 **[grpc]**
 : Section for gRPC socket listener settings. Contains three properties:
  - **address** (Default: "/run/containerd/containerd.sock")
@@ -82,6 +90,7 @@ The following is a complete **config.toml** default configuration example:
 root = "/var/lib/containerd"
 state = "/run/containerd"
 oom_score = 0
+imports = ["/etc/containerd/runtime_*.toml", "./debug.toml"]
 
 [grpc]
   address = "/run/containerd/containerd.sock"

docs/stream_processors.md

@@ -21,20 +21,20 @@ pipe's path set as the value of the environment variable `STREAM_PROCESSOR_PIPE`
 ## Configuration
 
 To configure stream processors for containerd, entries in the config file need to be made.
-The `stream_processors` field is an array so that users can chain together multiple processors
+The `stream_processors` field is a map so that users can chain together multiple processors
 to mutate content streams.
 
 Processor Fields:
 
-* `id` - ID of the processor, used for passing a specific payload to the processor.
+* Key - ID of the processor, used for passing a specific payload to the processor.
 * `accepts` - Accepted media-types for the processor that it can handle.
 * `returns` - The media-type that the processor returns.
 * `path` - Path to the processor binary.
 * `args` - Arguments passed to the processor binary.
 
 ```toml
-[[stream_processors]]
-	id = "io.containerd.processor.v1.pigz"
+[stream_processors]
+  [stream_processors."io.containerd.processor.v1.pigz"]
 	accepts = ["application/vnd.docker.image.rootfs.diff.tar.gzip"]
 	returns = "application/vnd.oci.image.layer.v1.tar"
 	path = "unpigz"