diff --git "a/kata-v3.15.0/doc/kata-deploy\350\207\252\345\212\250\345\214\226\351\203\250\347\275\262.md" "b/kata-v3.15.0/doc/kata-deploy\350\207\252\345\212\250\345\214\226\351\203\250\347\275\262.md" index 1895d9a62d3f523913951533094a56bfee68e55c..86da92a793f041011680105080d957ae1959b3a8 100644 --- "a/kata-v3.15.0/doc/kata-deploy\350\207\252\345\212\250\345\214\226\351\203\250\347\275\262.md" +++ "b/kata-v3.15.0/doc/kata-deploy\350\207\252\345\212\250\345\214\226\351\203\250\347\275\262.md" @@ -203,7 +203,7 @@ docker run -d -p 5000:5000 \ -v /home/registry/certs:/certs \ -v /home/registry/data:/var/lib/registry \ -v /home/registry/config.yml:/etc/docker/registry/config.yml \ - registry:2 > /home/fuju/registry/registry.log 2>&1 & + registry:2 > /home/registry/registry.log 2>&1 & ``` > 查看registry调测日志:`docker logs -f registry.hw.com` diff --git a/kata-v3.15.0/tools/build.sh b/kata-v3.15.0/tools/build.sh index 781ca0640fcb4b341dd272b0e0c0cf495aa4fefb..038253ba2645b266531712a73e694d90d3bada4d 100644 --- a/kata-v3.15.0/tools/build.sh +++ b/kata-v3.15.0/tools/build.sh @@ -1375,17 +1375,11 @@ fi # Add nydus configuration to containerd sed -i '/^[[:space:]]*\[proxy_plugins\][[:space:]]*$/d' /etc/containerd/config.toml +sed -i '/\[plugins\."io\.containerd\.grpc\.v1\.cri"\.containerd\]/,/^\[/ s/snapshotter = "overlayfs"/snapshotter = "nydus"/' /etc/containerd/config.toml + if ! grep -q "proxy_plugins.nydus" /etc/containerd/config.toml; then sudo tee -a /etc/containerd/config.toml > /dev/null <<'EOF' -[plugins."io.containerd.grpc.v1.cri".containerd] - default_runtime_name = "runc" - disable_snapshot_annotations = false - discard_unpacked_layers = false - ignore_rdt_not_enabled_errors = false - no_pivot = false - snapshotter = "nydus" - [proxy_plugins] [proxy_plugins.nydus] type = "snapshot"