From 8e4b28177eac514a1e733764dc0ee155d3dd2971 Mon Sep 17 00:00:00 2001 From: Rahul Ganesh <31204974+rahulbabu95@users.noreply.github.com> Date: Wed, 24 Apr 2024 12:50:56 -0700 Subject: [PATCH] Improve build fail remediation logic to factor in newer docker versions (#3109) Prow is not detecting the builder base image job being skipped. Manually merging instead. Signed-off-by: Rahul Ganesh --- build/lib/buildkit.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/lib/buildkit.sh b/build/lib/buildkit.sh index 5f701bece4..8a41e2b6a4 100755 --- a/build/lib/buildkit.sh +++ b/build/lib/buildkit.sh @@ -128,7 +128,7 @@ else echo "Ensure container registry and repository exists!!" echo "Try running make create-ecr-repos to create ecr repositories in your aws account." echo "******************************************************" - elif [ "$CMD" = "docker buildx" ] && grep -i -q "\(multiple platforms\|OCI exporter\) feature is currently not supported" $log_file; then + elif [ "$CMD" = "docker buildx" ] && grep -i -q "\(multiple platforms\|OCI exporter\|Multi-platform\)" $log_file; then echo "******************************************************" echo "When using docker buildx with multiple platforms you can not use the default builder." echo "You need to create another builder using the docker-container or remote driver."