Merge pull request #410 from klihub/devel/race-detector-in-debug-imag…

…e-builds build: enable race-detector in image build, too.
containers · Nov 13, 2024 · c386e91 · c386e91
2 parents c003258 + c14d6b3
commit c386e91
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/Makefile b/Makefile
@@ -108,6 +108,8 @@ ifeq ($(DEBUG),1)
     DOCKER_BUILD_DEBUG := --build-arg DEBUG=1
   ifneq ($(NORACE),1)
     BUILD_FLAGS += -race
+  else
+    DOCKER_BUILD_DEBUG += --build-arg NORACE=1
   endif
 endif
 
@@ -148,12 +150,12 @@ verify: verify-godeps verify-fmt verify-generate verify-build verify-docs
 build-plugins: $(foreach bin,$(PLUGINS),$(BIN_PATH)/$(bin))
 
 build-plugins-static:
-	$(MAKE) STATIC=1 DEBUG=$(DEBUG) build-plugins
+	$(MAKE) STATIC=1 DEBUG=$(DEBUG) NORACE=$(NORACE) build-plugins
 
 build-binaries: $(foreach bin,$(BINARIES),$(BIN_PATH)/$(bin))
 
 build-binaries-static:
-	$(MAKE) STATIC=1 DEBUG=$(DEBUG) build-binaries
+	$(MAKE) STATIC=1 DEBUG=$(DEBUG) NORACE=$(NORACE) build-binaries
 
 build-images: images
 

diff --git a/cmd/plugins/balloons/Dockerfile b/cmd/plugins/balloons/Dockerfile
@@ -6,6 +6,7 @@ ARG IMAGE_VERSION
 ARG BUILD_VERSION
 ARG BUILD_BUILDID
 ARG DEBUG=0
+ARG NORACE=0
 
 WORKDIR /go/builder
 
@@ -24,7 +25,7 @@ RUN go mod download
 COPY . .
 
 RUN make clean
-RUN make IMAGE_VERSION=${IMAGE_VERSION} BUILD_VERSION=${BUILD_VERSION} BUILD_BUILDID=${BUILD_BUILDID} PLUGINS=nri-resource-policy-balloons DEBUG=$DEBUG V=$DEBUG build-plugins-static
+RUN make IMAGE_VERSION=${IMAGE_VERSION} BUILD_VERSION=${BUILD_VERSION} BUILD_BUILDID=${BUILD_BUILDID} PLUGINS=nri-resource-policy-balloons DEBUG=$DEBUG NORACE=$NORACE V=$DEBUG build-plugins-static
 
 RUN cpgodir() { \
         mkdir -p $2; \

diff --git a/cmd/plugins/topology-aware/Dockerfile b/cmd/plugins/topology-aware/Dockerfile
@@ -6,6 +6,7 @@ ARG IMAGE_VERSION
 ARG BUILD_VERSION
 ARG BUILD_BUILDID
 ARG DEBUG=0
+ARG NORACE=0
 
 WORKDIR /go/builder
 
@@ -24,7 +25,7 @@ RUN go mod download
 COPY . .
 
 RUN make clean
-RUN make IMAGE_VERSION=${IMAGE_VERSION} BUILD_VERSION=${BUILD_VERSION} BUILD_BUILDID=${BUILD_BUILDID} PLUGINS=nri-resource-policy-topology-aware DEBUG=$DEBUG V=$DEBUG build-plugins-static
+RUN make IMAGE_VERSION=${IMAGE_VERSION} BUILD_VERSION=${BUILD_VERSION} BUILD_BUILDID=${BUILD_BUILDID} PLUGINS=nri-resource-policy-topology-aware DEBUG=$DEBUG NORACE=$NORACE V=$DEBUG build-plugins-static
 
 RUN cpgodir() { \
         mkdir -p $2; \