Skip to content

Commit a3f877d

Browse files
chore: [SVLS-6279] make sure we are fipsing correctly
1 parent 8b19508 commit a3f877d

2 files changed

Lines changed: 12 additions & 6 deletions

File tree

.gitlab/scripts/Dockerfile.go_agent.alpine.compile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,6 @@ ENV GOROOT=/usr/lib/go
1313
ENV GOPATH=/go
1414
ENV PATH=/go/bin:$PATH
1515

16-
ENV CGO_ENABLED=${FIPS:+1}
17-
ENV GOEXPERIMENT=${FIPS:+boringcrypto}
18-
1916
RUN mkdir -p ${GOPATH}/src ${GOPATH}/bin
2017
RUN mkdir -p /tmp/dd/datadog-agent
2118

@@ -33,6 +30,12 @@ WORKDIR /tmp/dd/datadog-agent/cmd/serverless
3330

3431
RUN --mount=type=cache,target=/go/pkg/mod \
3532
--mount=type=cache,target=/root/.cache/go-build \
33+
if [ "$FIPS" = "1" ]; then \
34+
export CGO_ENABLED=1; \
35+
export GOEXPERIMENT=boringcrypto; \
36+
fi; \
37+
echo CGO_ENABLED=$CGO_ENABLED; \
38+
echo GOEXPERIMENT=$GOEXPERIMENT; \
3639
if [ -z "$AGENT_VERSION" ]; then \
3740
/usr/lib/go/bin/go build -ldflags="-w -extldflags '-static' \
3841
-X github.com/DataDog/datadog-agent/pkg/serverless/tags.currentExtensionVersion=$EXTENSION_VERSION" \

.gitlab/scripts/Dockerfile.go_agent.compile

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,6 @@ ARG AGENT_VERSION
44
ARG BUILD_TAGS
55
ARG FIPS
66

7-
ENV CGO_ENABLED=${FIPS:+1}
8-
ENV GOEXPERIMENT=${FIPS:+boringcrypto}
9-
107
RUN mkdir -p /tmp/dd/datadog-agent
118

129
RUN yum install -y wget tar gzip gcc
@@ -34,6 +31,12 @@ WORKDIR /tmp/dd/datadog-agent/cmd/serverless
3431

3532
RUN --mount=type=cache,target=/root/go/pkg/mod \
3633
--mount=type=cache,target=/root/.cache/go-build \
34+
if [ "$FIPS" = "1" ]; then \
35+
export CGO_ENABLED=1; \
36+
export GOEXPERIMENT=boringcrypto; \
37+
fi; \
38+
echo CGO_ENABLED=$CGO_ENABLED; \
39+
echo GOEXPERIMENT=$GOEXPERIMENT; \
3740
if [ -z "$AGENT_VERSION" ]; then \
3841
/usr/local/go/bin/go build -ldflags="-w \
3942
-X github.com/DataDog/datadog-agent/pkg/serverless/tags.currentExtensionVersion=$EXTENSION_VERSION" \

0 commit comments

Comments
 (0)