From d5fa83ec317b56b32e9cfcd425e98e2e49beab22 Mon Sep 17 00:00:00 2001 From: Francesco Pantano <fpantano@redhat.com> Date: Mon, 5 Feb 2024 11:06:51 +0100 Subject: [PATCH] Build a FIPS compatible operator image This change is aligned with the work already done for other operators, and the goal is to build a FIPS compatible manila-operator image. For this reason, the BASE_IMAGE has been moved to ubi-minimal and the toolchain uses go-toolset. Both CGO and GO111MODULE are enabled and passed as extra args to go build. Signed-off-by: Francesco Pantano <fpantano@redhat.com> --- .prow_ci.env | 1 + Dockerfile | 12 ++++++++---- Makefile | 5 ++++- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.prow_ci.env b/.prow_ci.env index 2606e6b6..ce722ac7 100644 --- a/.prow_ci.env +++ b/.prow_ci.env @@ -1 +1,2 @@ export USE_IMAGE_DIGESTS=true +export FAIL_FIPS_CHECK=true diff --git a/Dockerfile b/Dockerfile index 51f94e44..9cae1c11 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ -ARG GOLANG_BUILDER=golang:1.19 -ARG OPERATOR_BASE_IMAGE=gcr.io/distroless/static:nonroot +ARG GOLANG_BUILDER=registry.access.redhat.com/ubi9/go-toolset:1.19 +ARG OPERATOR_BASE_IMAGE=registry.access.redhat.com/ubi9/ubi-minimal:latest # Build the manager binary FROM $GOLANG_BUILDER AS builder @@ -12,11 +12,15 @@ ARG REMOTE_SOURCE_DIR=/remote-source ARG REMOTE_SOURCE_SUBDIR= ARG DEST_ROOT=/dest-root -ARG GO_BUILD_EXTRA_ARGS= +ARG GO_BUILD_EXTRA_ARGS="-tags strictfipsruntime" +# note we set CGO_ENABLED=0 to force a static build so that we can use +# distroless/static as our base image +ARG GO_BUILD_EXTRA_ENV_ARGS="CGO_ENABLED=1 GO111MODULE=on" COPY $REMOTE_SOURCE $REMOTE_SOURCE_DIR WORKDIR $REMOTE_SOURCE_DIR/$REMOTE_SOURCE_SUBDIR +USER root RUN mkdir -p ${DEST_ROOT}/usr/local/bin/ # cache deps before building and copying source so that we don't need to re-download as much @@ -24,7 +28,7 @@ RUN mkdir -p ${DEST_ROOT}/usr/local/bin/ RUN if [ ! -f $CACHITO_ENV_FILE ]; then go mod download ; fi # Build manager -RUN if [ -f $CACHITO_ENV_FILE ] ; then source $CACHITO_ENV_FILE ; fi ; CGO_ENABLED=0 GO111MODULE=on go build ${GO_BUILD_EXTRA_ARGS} -a -o ${DEST_ROOT}/manager main.go +RUN if [ -f $CACHITO_ENV_FILE ] ; then source $CACHITO_ENV_FILE ; fi ; env ${GO_BUILD_EXTRA_ENV_ARGS} go build ${GO_BUILD_EXTRA_ARGS} -a -o ${DEST_ROOT}/manager main.go RUN cp -r templates ${DEST_ROOT}/templates diff --git a/Makefile b/Makefile index 190aa22f..d9428ad4 100644 --- a/Makefile +++ b/Makefile @@ -95,6 +95,9 @@ endif SHELL = /usr/bin/env bash -o pipefail .SHELLFLAGS = -ec +# Extra vars which will be passed to the Docker-build +DOCKER_BUILD_ARGS ?= + .PHONY: all all: build @@ -170,7 +173,7 @@ run: manifests generate fmt vet ## Run a controller from your host. .PHONY: docker-build docker-build: test ## Build docker image with the manager. - podman build --build-arg GOWORK=$(GOWORK) -t ${IMG} . + podman build --build-arg GOWORK=$(GOWORK) -t ${IMG} . ${DOCKER_BUILD_ARGS} .PHONY: docker-push docker-push: ## Push docker image with the manager.