fixes for building and testing arm locally

Author: robbycochran

Makefile

@@ -30,10 +30,12 @@ container-dockerfile-dev:
 .PHONY: builder
 builder:
 ifneq ($(BUILD_BUILDER_IMAGE), false)
-	docker buildx build --load --platform ${PLATFORM} \
-		-t quay.io/stackrox-io/collector-builder:$(COLLECTOR_BUILDER_TAG) \
+	docker buildx build --load --platform $(PLATFORM) \
+		-t $(COLLECTOR_BUILDER_IMAGE) \
 		-f "$(CURDIR)/builder/Dockerfile" \
 		"$(CURDIR)/builder"
+else
+	docker pull --platform $(PLATFORM) $(COLLECTOR_BUILDER_IMAGE)
 endif
 
 collector: check-builder
@@ -57,7 +59,7 @@ build-drivers:
 
 image: collector unittest
 	make -C collector txt-files
-	docker buildx build --load --platform ${PLATFORM} \
+	docker buildx build --load --platform $(PLATFORM) \
 		--build-arg COLLECTOR_VERSION="$(COLLECTOR_TAG)" \
 		--build-arg MODULE_VERSION="$(MODULE_VERSION)" \
 		-f collector/container/Dockerfile \
@@ -66,7 +68,8 @@ image: collector unittest
 
 image-dev: collector unittest container-dockerfile-dev
 	make -C collector txt-files
-	docker build --build-arg collector_version="$(COLLECTOR_TAG)" \
+	docker buildx build --load --platform $(PLATFORM) \
+		--build-arg collector_version="$(COLLECTOR_TAG)" \
 		--build-arg BUILD_TYPE=devel \
 		--build-arg MODULE_VERSION="$(MODULE_VERSION)" \
 		-f collector/container/Dockerfile.dev \
@@ -75,7 +78,7 @@ image-dev: collector unittest container-dockerfile-dev
 
 image-dev-full: image-dev build-drivers
 	docker tag quay.io/stackrox-io/collector:$(COLLECTOR_TAG) quay.io/stackrox-io/collector:$(COLLECTOR_TAG)-slim
-	docker build \
+	docker buildx build --load --platform $(PLATFORM) \
 		--target=probe-layer-1 \
 		--tag quay.io/stackrox-io/collector:$(COLLECTOR_TAG)-full \
 		--build-arg collector_repo=quay.io/stackrox-io/collector \
@@ -115,7 +118,7 @@ start-builder: builder teardown-builder
 		$(if $(LOCAL_SSH_PORT),-p $(LOCAL_SSH_PORT):22 )\
 		-w $(CURDIR) \
 		--cap-add sys_ptrace \
-		quay.io/stackrox-io/collector-builder:$(COLLECTOR_BUILDER_TAG)
+		$(COLLECTOR_BUILDER_IMAGE)
 
 .PHONY: check-builder
 check-builder:
@@ -128,6 +131,7 @@ teardown-builder:
 .PHONY: clean
 clean:
 	rm -rf cmake-build/
+	rm -rf $(CMAKE_BASE_DIR)
 	make -C collector clean
 
 .PHONY: shfmt-check

Makefile-constants.mk

@@ -11,16 +11,20 @@ COLLECTOR_TAG := $(CIRCLE_TAG)
 endif
 endif
 
+PLATFORM ?= $(shell docker system info --format {{.OSType}}/{{.Architecture}})
+
 USE_VALGRIND ?= false
 ADDRESS_SANITIZER ?= false
 CMAKE_BUILD_TYPE ?= Release
+CMAKE_BASE_DIR = cmake-build-$(shell echo $(CMAKE_BUILD_TYPE) | tr A-Z a-z)-$(subst /,-,$(PLATFORM))
 COLLECTOR_APPEND_CID ?= false
-PLATFORM ?= linux/amd64
 TRACE_SINSP_EVENTS ?= false
 DISABLE_PROFILING ?= false
 BPF_DEBUG_MODE ?= false
 
 COLLECTOR_BUILD_CONTEXT = collector/
-COLLECTOR_BUILDER_NAME ?= collector_builder
+COLLECTOR_BUILDER_NAME ?= collector_builder_$(subst /,_,$(PLATFORM))
+COLLECTOR_BUILDER_REPO=quay.io/stackrox-io/collector-builder
+COLLECTOR_BUILDER_IMAGE="$(COLLECTOR_BUILDER_REPO):$(COLLECTOR_BUILDER_TAG)"
 
 export COLLECTOR_PRE_ARGUMENTS

collector/Makefile

@@ -3,7 +3,6 @@ include ../Makefile-constants.mk
 
 NPROCS ?= $(shell nproc)
 
-CMAKE_BASE_DIR = cmake-build
 CMAKE_DIR= $(BASE_PATH)/$(CMAKE_BASE_DIR)
 COLLECTOR_BIN_DIR = $(CMAKE_DIR)/collector
 LIBSINSP_BIN_DIR = $(CMAKE_DIR)/collector/EXCLUDE_FROM_DEFAULT_BUILD/libsinsp
@@ -67,8 +66,6 @@ txt-files:
 clean:
 	docker rm -fv build_collector || true
 	docker rm -fv container-stats benchmark collector grpc-server || true
-	rm -rf falcosecurity-libs/cmake-build
-	rm -rf falcosecurity-libs/falcosecurity-libs-build
 	rm -rf container/bin
 	rm -rf container/driver
 	rm -rf container/libs