From c937964d54ae56377254a2064ddc4f4f098d2bd9 Mon Sep 17 00:00:00 2001 From: Martin Redolatti Date: Mon, 4 Mar 2024 18:33:21 -0300 Subject: [PATCH] fix unstable image building --- .github/workflows/unstable.yml | 2 ++ Makefile | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/unstable.yml b/.github/workflows/unstable.yml index 152480a..02c8c7a 100644 --- a/.github/workflows/unstable.yml +++ b/.github/workflows/unstable.yml @@ -32,3 +32,5 @@ jobs: file: "infra/sidecar.Dockerfile" push: true tags: splitio-docker-dev.jfrog.io/splitd/sidecar${{ matrix.fips_mode == 'enabled' && '-fips' || '' }}:${{ env.SHORT_SHA }} + build-args: | + FIPS_MODE=${{ matrix.fips_mode }} diff --git a/Makefile b/Makefile index e58bec3..72345b9 100644 --- a/Makefile +++ b/Makefile @@ -85,7 +85,7 @@ images_release: # entrypoints --build-arg COMMIT_SHA=$(COMMIT_SHA) \ -f infra/sidecar.Dockerfile . $(DOCKER) build $(PLATFORM_STR) -t splitsoftware/splitd-sidecar-fips:latest -t splitsoftware/splitd-sidecar-fips:$(VERSION) \ - --build-arg FIPS_MODE=1 --build-arg COMMIT_SHA=$(COMMIT_SHA) \ + --build-arg FIPS_MODE=enabled --build-arg COMMIT_SHA=$(COMMIT_SHA) \ -f infra/sidecar.Dockerfile . @echo "Image created. Make sure everything works ok, and then run the following commands to push them." @echo "$(DOCKER) push splitsoftware/splitd-sidecar:latest"