build,Dockerfiles: enable race-detector in image builds, too.

Signed-off-by: Krisztian Litkey <[email protected]>
containers · Nov 12, 2024 · b45d52f · b45d52f
1 parent c003258
commit b45d52f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/Makefile b/Makefile
@@ -108,6 +108,7 @@ ifeq ($(DEBUG),1)
     DOCKER_BUILD_DEBUG := --build-arg DEBUG=1
   ifneq ($(NORACE),1)
     BUILD_FLAGS += -race
+    DOCKER_BUILD_DEBUG += --build-arg RACE=1
   endif
 endif
 

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 RACE=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 RACE=$RACE 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 RACE=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 RACE=$RACE V=$DEBUG build-plugins-static
 
 RUN cpgodir() { \
         mkdir -p $2; \