Merge pull request #35 from splitio/docker/fix_build

fix unstable image building
splitio · Mar 5, 2024 · ae80227 · ae80227
2 parents b4ad5d8 + e30cb8f
commit ae80227
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git 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
@@ -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"