Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

skips buildkit check in codebuild #2545

Merged
merged 1 commit into from
Oct 12, 2023
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion Common.mk
Original file line number Diff line number Diff line change
Expand Up @@ -1008,9 +1008,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"; \
Expand Down