Merge pull request #2084 from carlosedp/riscv64-manifest

Add riscv64 to manifest annotation and bash completion
2019-09-13 14:11:41 -07:00 · 2019-09-13 14:11:41 -07:00 · 95327f4e62
parent 016a323216 41aa20b6b5
commit 95327f4e62
2 changed files with 2 additions and 0 deletions
--- a/cli/command/manifest/util.go
+++ b/cli/command/manifest/util.go
@ -35,6 +35,7 @@ var validOSArches = map[osArch]bool{
 	{os: "linux", arch: "ppc64le"}:   true,
 	{os: "linux", arch: "mips64"}:    true,
 	{os: "linux", arch: "mips64le"}:  true,
+	{os: "linux", arch: "riscv64"}:   true,
 	{os: "linux", arch: "s390x"}:     true,
 	{os: "netbsd", arch: "386"}:      true,
 	{os: "netbsd", arch: "amd64"}:    true,
--- a/contrib/completion/bash/docker
+++ b/contrib/completion/bash/docker
@ -4186,6 +4186,7 @@ _docker_manifest_annotate() {
 				mips64
 				mips64le
 				ppc64le
+				riscv64
 				s390x" -- "$cur" ) )
 			return
 			;;