From ea6c749e3536d0bb745a4902954d0caf115af4ba Mon Sep 17 00:00:00 2001 From: Maksym Pavlenko Date: Fri, 23 Aug 2019 11:08:25 -0700 Subject: [PATCH] Update config doc Signed-off-by: Maksym Pavlenko --- docs/man/containerd-config.toml.5.md | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/docs/man/containerd-config.toml.5.md b/docs/man/containerd-config.toml.5.md index 21a603cea..6b5c2cc77 100644 --- a/docs/man/containerd-config.toml.5.md +++ b/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"