Skip to content

Commit 8126dfc

Browse files
committed
ROX-24283: enable strictfipsruntime in Konflux build
1 parent 97c41a7 commit 8126dfc

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

Makefile

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -240,6 +240,10 @@ endif
240240
scanner-build-nodeps:
241241
$(BUILD_FLAGS) $(BUILD_CMD)
242242

243+
.PHONY: scanner-build-nodeps-konflux
244+
scanner-build-nodeps-konflux:
245+
$(BUILD_FLAGS) $(BUILD_CMD) -tags=strictfipsruntime
246+
243247
.PHONY: $(CURDIR)/image/scanner/rhel/bundle.tar.gz
244248
$(CURDIR)/image/scanner/rhel/bundle.tar.gz:
245249
$(CURDIR)/image/scanner/rhel/create-bundle.sh $(CURDIR)/image/scanner $(CURDIR)/image/scanner/rhel

image/scanner/rhel/konflux.Dockerfile

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ ARG SCANNER_TAG
1010
RUN if [[ "$SCANNER_TAG" == "" ]]; then >&2 echo "error: required SCANNER_TAG arg is unset"; exit 6; fi
1111
ENV RELEASE_TAG="${SCANNER_TAG}"
1212

13+
ENV GOEXPERIMENT=strictfipsruntime
1314
ENV GOFLAGS=""
1415
ENV CI=1
1516

@@ -23,7 +24,7 @@ RUN unzip -j blob-repo2cpe.zip -d image/scanner/dump/repo2cpe && \
2324
unzip -j blob-nvd-definitions.zip -d image/scanner/dump/nvd_definitions
2425

2526
RUN echo -n "version: " && make --quiet --no-print-directory tag && \
26-
make CGO_ENABLED=1 scanner-build-nodeps
27+
make CGO_ENABLED=1 scanner-build-nodeps-konflux
2728

2829
# Replace genesis manifests file in the source code with the one generated at
2930
# the point when the dump was taken. This is to avoid discrepancy between other

0 commit comments

Comments
 (0)