Merge remote-tracking branch 'upstream/master' into dev-1.20

2020-12-07 10:39:57 -06:00
parent 72d21d074c b905af1f34
commit 7f43aceddb
167 changed files with 8101 additions and 4131 deletions
@@ -122,7 +122,7 @@ sudo apt-get update && sudo apt-get install -y containerd.io
 ```shell
 # Configure containerd
 sudo mkdir -p /etc/containerd
-sudo containerd config default > /etc/containerd/config.toml
+sudo containerd config default | sudo tee /etc/containerd/config.toml
 ```

 ```shell