From f82b5ec8cbadd7e3dcef5838ebbf080b780af2bb Mon Sep 17 00:00:00 2001 From: Walt Della Date: Thu, 15 Jun 2023 14:21:08 -0700 Subject: [PATCH] Fix fips buildbox BUILDBOX_FIPS was removed, replaced by BUILDBOX_CENTOS7_FIPS. Unfortunately I missed updating this target in #26859. This subsequently broke e CI. --- build.assets/Makefile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/build.assets/Makefile b/build.assets/Makefile index 63de1fcfea50e..cf492d9d9d0c5 100644 --- a/build.assets/Makefile +++ b/build.assets/Makefile @@ -58,7 +58,6 @@ include grpcbox.mk # target. The other solution was to remove the 'buildbox' dependency from the 'release' target, but this would # make it harder to run `make -C build.assets release` locally as the buildbox would not automatically be built. BUILDBOX_NAME=$(BUILDBOX) -BUILDBOX_FIPS_NAME=$(BUILDBOX_FIPS) DOCSBOX=ghcr.io/gravitational/docs @@ -435,9 +434,9 @@ release-arm64: buildbox-arm # CI should not use this target, it should use named Makefile targets like release-amd64-fips. # .PHONY:release-fips -release-fips: buildbox-fips +release-fips: buildbox-centos7-fips @if [ -z ${VERSION} ]; then echo "VERSION is not set"; exit 1; fi - docker run $(DOCKERFLAGS) -i $(NOROOT) $(BUILDBOX_FIPS_NAME) \ + docker run $(DOCKERFLAGS) -i $(NOROOT) $(BUILDBOX_CENTOS7_FIPS) \ /usr/bin/make -C e release -e ADDFLAGS="$(ADDFLAGS)" OS=$(OS) ARCH=$(ARCH) RUNTIME=$(GOLANG_VERSION) FIPS=yes VERSION=$(VERSION) GITTAG=v$(VERSION) REPRODUCIBLE=yes #