Skip to content

Commit

Permalink
Merge pull request #479 from AkihiroSuda/dev
Browse files Browse the repository at this point in the history
nerdctl: update to v0.15.0
  • Loading branch information
AkihiroSuda authored Dec 14, 2021
2 parents ecc4f8b + 91c387c commit ad63648
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
4 changes: 2 additions & 2 deletions hack/test-example.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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)"
Expand Down
6 changes: 3 additions & 3 deletions pkg/limayaml/defaults.go
Original file line number Diff line number Diff line change
Expand Up @@ -21,20 +21,20 @@ 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"
}
return []File{
{
Location: location("amd64"),
Arch: X8664,
Digest: "sha256:3423cb589bb5058ff9ed55f6823adec1299fe2e576612fc6f706fe07eddd398b",
Digest: "sha256:ca40d99d257e69f0220bb1cbdab1b602032692f45f713c901f328d2f4e3c12b3",
},
{
Location: location("arm64"),
Arch: AARCH64,
Digest: "sha256:32898576fa89392d1af8c21ff3854c0f54d2c66c0de87598be813f25051366e5",
Digest: "sha256:dd8639ce868bab394467576f55375c4b40a8288badb579d2e30c3487da6004ea",
},
}
}
Expand Down

0 comments on commit ad63648

Please sign in to comment.