diff --git a/otelcolbuilder/Makefile b/otelcolbuilder/Makefile index e378d56e2a..928637aede 100644 --- a/otelcolbuilder/Makefile +++ b/otelcolbuilder/Makefile @@ -151,8 +151,9 @@ build-debug: ensure-correct-builder-version .PHONY: build-fips build-fips: + docker volume create build-fips docker build --platform linux/amd64 -t otelcol-sumo-builder-fips -f ./build-fips/Dockerfile ./build-fips - docker run -it --platform linux/amd64 --rm -v $(PWD)/../:/root/workspace -w /root/workspace otelcol-sumo-builder-fips + docker run -it --platform linux/amd64 --rm -v build-fips:/root/build -v $(PWD)/../:/root/workspace -w /root/workspace otelcol-sumo-builder-fips .PHONY: generate-sources generate-sources: diff --git a/otelcolbuilder/build-fips/entrypoint.sh b/otelcolbuilder/build-fips/entrypoint.sh index 7f52ba9901..f3a149ba3b 100755 --- a/otelcolbuilder/build-fips/entrypoint.sh +++ b/otelcolbuilder/build-fips/entrypoint.sh @@ -1,6 +1,7 @@ #!/usr/bin/env sh -cp -r /root/workspace /root/build +# Mac security suite is interferring, can't build in bind mount workspace +cp -r /root/workspace/* /root/build/ cd /root/build # Install builder @@ -12,3 +13,6 @@ make install-builder # Build otelcol-sumo make otelcol-sumo-linux-fips_amd64 make otelcol-sumo-linux-fips_arm64 + +# Copy produced binaries to bind mount workspace +cp cmd/otelcol-sumo-fips-linux_* /root/workspace/otelcolbuilder/cmd/