Merge pull request #1820 from ningziwen/nerdctl

AkihiroSuda · web-flow · commit 4cf21b04a598 · 2023-09-20T12:56:46.000+09:00
Bump Nerdctl to 1.6.0
diff --git a/pkg/limayaml/defaults.go b/pkg/limayaml/defaults.go
@@ -38,20 +38,20 @@ const (
 )
 
 func defaultContainerdArchives() []File {
-	const nerdctlVersion = "1.5.0"
+	const nerdctlVersion = "1.6.0"
 	location := func(goos string, goarch string) string {
 		return "https://github.com/containerd/nerdctl/releases/download/v" + nerdctlVersion + "/nerdctl-full-" + nerdctlVersion + "-" + goos + "-" + goarch + ".tar.gz"
 	}
 	return []File{
 		{
 			Location: location("linux", "amd64"),
 			Arch:     X8664,
-			Digest:   "sha256:3f8c494e3c6a265fe2a3c41ef9d6bc859eeeb22095b3353d3558d8120833a23a",
+			Digest:   "sha256:2c5c43a8b77ed62090241027361baa62d8fb70a759bc9e7a82c637135598701f",
 		},
 		{
 			Location: location("linux", "arm64"),
 			Arch:     AARCH64,
-			Digest:   "sha256:32a2537e0a80e1493b5934ca56c3e237466606a1b720aef23b9c0a7fc3303bdb",
+			Digest:   "sha256:1f5c2db10b4340197dfa63cfee749ad7d0b60d774433d84181815c899c359c80",
 		},
 		// No arm-v7
 		// No riscv64

Original file line number	Diff line number	Diff line change
`@@ -38,20 +38,20 @@ const (`
`38`	`38`	`)`
`39`	`39`
`40`	`40`	`func defaultContainerdArchives() []File {`
`41`		`- const nerdctlVersion = "1.5.0"`
	`41`	`+ const nerdctlVersion = "1.6.0"`
`42`	`42`	`location := func(goos string, goarch string) string {`
`43`	`43`	`return "https://github.com/containerd/nerdctl/releases/download/v" + nerdctlVersion + "/nerdctl-full-" + nerdctlVersion + "-" + goos + "-" + goarch + ".tar.gz"`
`44`	`44`	`}`
`45`	`45`	`return []File{`
`46`	`46`	`{`
`47`	`47`	`Location: location("linux", "amd64"),`
`48`	`48`	`Arch: X8664,`
`49`		`- Digest: "sha256:3f8c494e3c6a265fe2a3c41ef9d6bc859eeeb22095b3353d3558d8120833a23a",`
	`49`	`+ Digest: "sha256:2c5c43a8b77ed62090241027361baa62d8fb70a759bc9e7a82c637135598701f",`
`50`	`50`	`},`
`51`	`51`	`{`
`52`	`52`	`Location: location("linux", "arm64"),`
`53`	`53`	`Arch: AARCH64,`
`54`		`- Digest: "sha256:32a2537e0a80e1493b5934ca56c3e237466606a1b720aef23b9c0a7fc3303bdb",`
	`54`	`+ Digest: "sha256:1f5c2db10b4340197dfa63cfee749ad7d0b60d774433d84181815c899c359c80",`
`55`	`55`	`},`
`56`	`56`	`// No arm-v7`
`57`	`57`	`// No riscv64`