diff options
| -rw-r--r-- | docs/runtime-handler-quickstart.md | 10 | ||||
| -rw-r--r-- | docs/untrusted-workload-quickstart.md | 10 | ||||
| -rwxr-xr-x | test/e2e/shim-install.sh | 8 |
3 files changed, 14 insertions, 14 deletions
diff --git a/docs/runtime-handler-quickstart.md b/docs/runtime-handler-quickstart.md index d8fea65fd..e48b2dd1a 100644 --- a/docs/runtime-handler-quickstart.md +++ b/docs/runtime-handler-quickstart.md @@ -19,20 +19,20 @@ later. [embedmd]:# (../test/e2e/shim-install.sh shell /{ # Step 1\(release\)/ /^}/) ```shell { # Step 1(release): Install gvisor-containerd-shim -LATEST_RELEASE=$(wget -qO - https://api.github.com/repos/google/gvisor-containerd-shim/releases | grep -oP '(?<="browser_download_url": ")https://[^"]*' | head -1) -wget -O gvisor-containerd-shim +LATEST_RELEASE=$(wget -qO - https://api.github.com/repos/google/gvisor-containerd-shim/releases | grep -oP '(?<="browser_download_url": ")https://[^"]*gvisor-containerd-shim.linux-amd64' | head -1) +wget -O gvisor-containerd-shim ${LATEST_RELEASE} chmod +x gvisor-containerd-shim sudo mv gvisor-containerd-shim /usr/local/bin/gvisor-containerd-shim } ``` 2. Create the configuration for the gvisor shim in - `/etc/containerd/gvisor-containerd-shim.yaml`: + `/etc/containerd/gvisor-containerd-shim.toml`: [embedmd]:# (../test/e2e/shim-install.sh shell /{ # Step 2/ /^}/) ```shell -{ # Step 2: Create the gvisor-containerd-shim.yaml -cat <<EOF | sudo tee /etc/containerd/gvisor-containerd-shim.yaml +{ # Step 2: Create the gvisor-containerd-shim.toml +cat <<EOF | sudo tee /etc/containerd/gvisor-containerd-shim.toml # This is the path to the default runc containerd-shim. runc_shim = "/usr/local/bin/containerd-shim" EOF diff --git a/docs/untrusted-workload-quickstart.md b/docs/untrusted-workload-quickstart.md index a85eb5add..fb4441845 100644 --- a/docs/untrusted-workload-quickstart.md +++ b/docs/untrusted-workload-quickstart.md @@ -22,20 +22,20 @@ are using containerd 1.2, please consider using runtime handler.* [embedmd]:# (../test/e2e/shim-install.sh shell /{ # Step 1/ /^}/) ```shell { # Step 1(release): Install gvisor-containerd-shim -LATEST_RELEASE=$(wget -qO - https://api.github.com/repos/google/gvisor-containerd-shim/releases | grep -oP '(?<="browser_download_url": ")https://[^"]*' | head -1) -wget -O gvisor-containerd-shim +LATEST_RELEASE=$(wget -qO - https://api.github.com/repos/google/gvisor-containerd-shim/releases | grep -oP '(?<="browser_download_url": ")https://[^"]*gvisor-containerd-shim.linux-amd64' | head -1) +wget -O gvisor-containerd-shim ${LATEST_RELEASE} chmod +x gvisor-containerd-shim sudo mv gvisor-containerd-shim /usr/local/bin/gvisor-containerd-shim } ``` 2. Create the configuration for the gvisor shim in - `/etc/containerd/gvisor-containerd-shim.yaml`: + `/etc/containerd/gvisor-containerd-shim.toml`: [embedmd]:# (../test/e2e/shim-install.sh shell /{ # Step 2/ /^}/) ```shell -{ # Step 2: Create the gvisor-containerd-shim.yaml -cat <<EOF | sudo tee /etc/containerd/gvisor-containerd-shim.yaml +{ # Step 2: Create the gvisor-containerd-shim.toml +cat <<EOF | sudo tee /etc/containerd/gvisor-containerd-shim.toml # This is the path to the default runc containerd-shim. runc_shim = "/usr/local/bin/containerd-shim" EOF diff --git a/test/e2e/shim-install.sh b/test/e2e/shim-install.sh index c0252bdd4..f98455d46 100755 --- a/test/e2e/shim-install.sh +++ b/test/e2e/shim-install.sh @@ -7,8 +7,8 @@ set -ex # Build gvisor-containerd-shim if [ "${INSTALL_LATEST}" == "1" ]; then { # Step 1(release): Install gvisor-containerd-shim -LATEST_RELEASE=$(wget -qO - https://api.github.com/repos/google/gvisor-containerd-shim/releases | grep -oP '(?<="browser_download_url": ")https://[^"]*' | head -1) -wget -O gvisor-containerd-shim +LATEST_RELEASE=$(wget -qO - https://api.github.com/repos/google/gvisor-containerd-shim/releases | grep -oP '(?<="browser_download_url": ")https://[^"]*gvisor-containerd-shim.linux-amd64' | head -1) +wget -O gvisor-containerd-shim ${LATEST_RELEASE} chmod +x gvisor-containerd-shim sudo mv gvisor-containerd-shim /usr/local/bin/gvisor-containerd-shim } @@ -19,8 +19,8 @@ else } fi -{ # Step 2: Create the gvisor-containerd-shim.yaml -cat <<EOF | sudo tee /etc/containerd/gvisor-containerd-shim.yaml +{ # Step 2: Create the gvisor-containerd-shim.toml +cat <<EOF | sudo tee /etc/containerd/gvisor-containerd-shim.toml # This is the path to the default runc containerd-shim. runc_shim = "/usr/local/bin/containerd-shim" EOF |