Skip to content

Commit ad63648

Browse files
authored
Merge pull request #479 from AkihiroSuda/dev
nerdctl: update to v0.15.0
2 parents ecc4f8b + 91c387c commit ad63648

File tree

2 files changed

+5
-5
lines changed

2 files changed

+5
-5
lines changed

hack/test-example.sh

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ if [[ -n ${CHECKS["containerd-user"]} ]]; then
168168
limactl shell "$NAME" nerdctl info
169169
# Use GHCR to avoid hitting Docker Hub rate limit
170170
nginx_image="ghcr.io/stargz-containers/nginx:1.19-alpine-org"
171-
limactl shell "$NAME" sh -ec "nerdctl pull ${nginx_image} >/dev/null"
171+
limactl shell "$NAME" nerdctl pull --quiet ${nginx_image}
172172
limactl shell "$NAME" nerdctl run -d --name nginx -p 127.0.0.1:8080:80 ${nginx_image}
173173

174174
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
184184
defer "rm -rf \"$hometmp\""
185185
set -x
186186
alpine_image="ghcr.io/containerd/alpine:3.14.0"
187-
limactl shell "$NAME" nerdctl pull ${alpine_image}
187+
limactl shell "$NAME" nerdctl pull --quiet ${alpine_image}
188188
echo "random-content-${RANDOM}" >"$hometmp/random"
189189
expected="$(cat "$hometmp/random")"
190190
got="$(limactl shell "$NAME" nerdctl run --rm -v "$hometmp/random":/mnt/foo ${alpine_image} cat /mnt/foo)"

pkg/limayaml/defaults.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,20 +21,20 @@ import (
2121
)
2222

2323
func defaultContainerdArchives() []File {
24-
const nerdctlVersion = "0.14.0"
24+
const nerdctlVersion = "0.15.0"
2525
location := func(goarch string) string {
2626
return "https://github.com/containerd/nerdctl/releases/download/v" + nerdctlVersion + "/nerdctl-full-" + nerdctlVersion + "-linux-" + goarch + ".tar.gz"
2727
}
2828
return []File{
2929
{
3030
Location: location("amd64"),
3131
Arch: X8664,
32-
Digest: "sha256:3423cb589bb5058ff9ed55f6823adec1299fe2e576612fc6f706fe07eddd398b",
32+
Digest: "sha256:ca40d99d257e69f0220bb1cbdab1b602032692f45f713c901f328d2f4e3c12b3",
3333
},
3434
{
3535
Location: location("arm64"),
3636
Arch: AARCH64,
37-
Digest: "sha256:32898576fa89392d1af8c21ff3854c0f54d2c66c0de87598be813f25051366e5",
37+
Digest: "sha256:dd8639ce868bab394467576f55375c4b40a8288badb579d2e30c3487da6004ea",
3838
},
3939
}
4040
}

0 commit comments

Comments
 (0)