Skip to content

Commit f5729c4

Browse files
Merge pull request #141 from nunnatsa/fips-support
ACM-21348: Modify the rhtap image for FIPS compliance
2 parents 630b054 + b638872 commit f5729c4

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

Dockerfile.rhtap

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.22 as builder
1+
FROM brew.registry.redhat.io/rh-osbs/openshift-golang-builder:rhel_9_1.23 as builder
22

33
# Run this with docker build --build_arg $(go env GOPROXY) to override the goproxy
44
ARG goproxy=https://proxy.golang.org
55
ENV GOPROXY=$goproxy
6-
ENV GOFLAGS="-mod=readonly"
6+
ENV GOFLAGS="-mod=readonly -tags=strictfipsruntime"
77

88
WORKDIR /workspace
99

@@ -15,10 +15,13 @@ RUN go mod download
1515
ARG package=.
1616
ARG ARCH
1717
ARG LDFLAGS
18-
RUN CGO_ENABLED=0 GOOS=linux GOARCH=${ARCH} go build -ldflags "${LDFLAGS} -extldflags '-static'" -o manager ${package}
18+
RUN CGO_ENABLED=1 GOOS=linux GOARCH=${ARCH} GOEXPERIMENT=strictfipsruntime go build -ldflags "${LDFLAGS}" -o manager ${package}
1919

2020
# Copy the controller-manager into a thin image
21-
FROM registry.redhat.io/rhel9-4-els/rhel:9.4
21+
FROM registry.redhat.io/rhel9-6-els/rhel:9.6
22+
23+
RUN dnf install -y openssl
24+
2225
WORKDIR /
2326
COPY --from=builder /workspace/manager .
2427
# Use uid of nonroot user (65532) because kubernetes expects numeric user when applying pod security policies

0 commit comments

Comments
 (0)