Merge branch 'master' into ssdoc

2020-07-29 11:44:10 -05:00
parent 375dd76255 63400c7694
commit fe9bb8da65
106 changed files with 30521 additions and 1378 deletions
--- a/docs/config.md
+++ b/docs/config.md
@@ -111,6 +111,10 @@ version = 2
    # stargz snapshotter (https://github.com/containerd/stargz-snapshotter)
    disable_snapshot_annotations = false

+    # discard_unpacked_layers allows GC to remove layers from the content store after
+    # successfully unpacking these layers to the snapshotter.
+    discard_unpacked_layers = false
+
    # default_runtime_name is the default runtime name to use.
    default_runtime_name = "runc"