dockerfiles/build.sh: fix buildx detection

Bastian-Krause · Bastian-Krause · commit d6ebde1ce7d7 · 2025-02-04T09:57:15.000+01:00
`docker <subcommand> --help` cannot be used to detect whether a sub command is available because it exits with 0 no matter if the sub command exists or not. Use `docker buildx version` as a test for buildx support instead. Fixes: 17765c7 ("dockerfiles: support for docker/podman buildx") Reported-by: Sebastian Groß <sebastian.gross@emlix.com> Signed-off-by: Bastian Krause <bst@pengutronix.de>
diff --git a/dockerfiles/build.sh b/dockerfiles/build.sh
@@ -31,7 +31,7 @@ has_buildx() {
     local docker_cmd
     docker_cmd="${1}"
 
-    "${docker_cmd}" buildx --help >/dev/null 2>&1
+    "${docker_cmd}" buildx version >/dev/null 2>&1
 }
 
 get_docker_cmd() {

Original file line number	Diff line number	Diff line change
`@@ -31,7 +31,7 @@ has_buildx() {`
`31`	`31`	`local docker_cmd`
`32`	`32`	`docker_cmd="${1}"`
`33`	`33`
`34`		`- "${docker_cmd}" buildx --help >/dev/null 2>&1`
	`34`	`+ "${docker_cmd}" buildx version >/dev/null 2>&1`
`35`	`35`	`}`
`36`	`36`
`37`	`37`	`get_docker_cmd() {`