From 297c76950a4296ce5a23f45c550a32e60aa60b30 Mon Sep 17 00:00:00 2001 From: Jackson West Date: Wed, 11 Oct 2023 21:20:20 -0500 Subject: [PATCH] skips buildkit check in codebuild (#2545) --- Common.mk | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/Common.mk b/Common.mk index 405f93dd50..cc21cbb836 100644 --- a/Common.mk +++ b/Common.mk @@ -1022,9 +1022,13 @@ ensure-docker: ensure/docker exit 1; \ fi +# in code build we use the /buildkit.sh to launch buildkitd when we need it +# in that case skip this check .PHONY: ensure-buildkitd-host ensure-buildkitd-host: - @if [ -z "$${BUILDKIT_HOST:-}" ] && [ ! -S /run/buildkit/buildkitd.sock ]; then \ + @if [ "true" = "$(CODEBUILD_CI)" ] && [ "true" = "$(IS_ON_BUILDER_BASE)" ]; then \ + exit 0; \ + elif [ -z "$${BUILDKIT_HOST:-}" ] && [ ! -S /run/buildkit/buildkitd.sock ]; then \ echo "Please set the 'BUILDKIT_HOST' environment variable."; \ echo "If you want to run buildkitd via a docker container use"; \ echo "export BUILDKIT_HOST=docker-container://buildkitd && make run-buildkit-and-registry"; \