Merge pull request #6455 from tonistiigi/amd64-variants

platforms: add support for matching amd64 variants
2022-01-27 10:07:49 -05:00
parent 3f5d789dfb af83e9af10
commit a43703fcba
3 changed files with 35 additions and 3 deletions
--- a/platforms/database.go
+++ b/platforms/database.go
@@ -86,9 +86,11 @@ func normalizeArch(arch, variant string) (string, string) {
 	case "i386":
 		arch = "386"
 		variant = ""
-	case "x86_64", "x86-64":
+	case "x86_64", "x86-64", "amd64":
 		arch = "amd64"
-		variant = ""
+		if variant == "v1" {
+			variant = ""
+		}
 	case "aarch64", "arm64":
 		arch = "arm64"
 		switch variant {