From 91c387cb959b12474e1f434f05c9e0910a2ef00a Mon Sep 17 00:00:00 2001 From: Akihiro Suda Date: Tue, 14 Dec 2021 19:31:05 +0900 Subject: [PATCH] nerdctl: update to v0.15.0 Signed-off-by: Akihiro Suda --- hack/test-example.sh | 4 ++-- pkg/limayaml/defaults.go | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/hack/test-example.sh b/hack/test-example.sh index ee5c8dd610c..0def8d431c6 100755 --- a/hack/test-example.sh +++ b/hack/test-example.sh @@ -168,7 +168,7 @@ if [[ -n ${CHECKS["containerd-user"]} ]]; then limactl shell "$NAME" nerdctl info # Use GHCR to avoid hitting Docker Hub rate limit nginx_image="ghcr.io/stargz-containers/nginx:1.19-alpine-org" - limactl shell "$NAME" sh -ec "nerdctl pull ${nginx_image} >/dev/null" + limactl shell "$NAME" nerdctl pull --quiet ${nginx_image} limactl shell "$NAME" nerdctl run -d --name nginx -p 127.0.0.1:8080:80 ${nginx_image} timeout 3m bash -euxc "until curl -f --retry 30 --retry-connrefused http://127.0.0.1:8080; do sleep 3; done" @@ -184,7 +184,7 @@ if [[ -n ${CHECKS["containerd-user"]} ]]; then defer "rm -rf \"$hometmp\"" set -x alpine_image="ghcr.io/containerd/alpine:3.14.0" - limactl shell "$NAME" nerdctl pull ${alpine_image} + limactl shell "$NAME" nerdctl pull --quiet ${alpine_image} echo "random-content-${RANDOM}" >"$hometmp/random" expected="$(cat "$hometmp/random")" got="$(limactl shell "$NAME" nerdctl run --rm -v "$hometmp/random":/mnt/foo ${alpine_image} cat /mnt/foo)" diff --git a/pkg/limayaml/defaults.go b/pkg/limayaml/defaults.go index 20fdbf0b512..943a2803eb1 100644 --- a/pkg/limayaml/defaults.go +++ b/pkg/limayaml/defaults.go @@ -21,7 +21,7 @@ import ( ) func defaultContainerdArchives() []File { - const nerdctlVersion = "0.14.0" + const nerdctlVersion = "0.15.0" location := func(goarch string) string { return "https://github.com/containerd/nerdctl/releases/download/v" + nerdctlVersion + "/nerdctl-full-" + nerdctlVersion + "-linux-" + goarch + ".tar.gz" } @@ -29,12 +29,12 @@ func defaultContainerdArchives() []File { { Location: location("amd64"), Arch: X8664, - Digest: "sha256:3423cb589bb5058ff9ed55f6823adec1299fe2e576612fc6f706fe07eddd398b", + Digest: "sha256:ca40d99d257e69f0220bb1cbdab1b602032692f45f713c901f328d2f4e3c12b3", }, { Location: location("arm64"), Arch: AARCH64, - Digest: "sha256:32898576fa89392d1af8c21ff3854c0f54d2c66c0de87598be813f25051366e5", + Digest: "sha256:dd8639ce868bab394467576f55375c4b40a8288badb579d2e30c3487da6004ea", }, } }