Skip to content

Commit ae80227

Browse files
authored
Merge pull request #35 from splitio/docker/fix_build
fix unstable image building
2 parents b4ad5d8 + e30cb8f commit ae80227

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

.github/workflows/unstable.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,3 +32,5 @@ jobs:
3232
file: "infra/sidecar.Dockerfile"
3333
push: true
3434
tags: splitio-docker-dev.jfrog.io/splitd/sidecar${{ matrix.fips_mode == 'enabled' && '-fips' || '' }}:${{ env.SHORT_SHA }}
35+
build-args: |
36+
FIPS_MODE=${{ matrix.fips_mode }}

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ images_release: # entrypoints
8585
--build-arg COMMIT_SHA=$(COMMIT_SHA) \
8686
-f infra/sidecar.Dockerfile .
8787
$(DOCKER) build $(PLATFORM_STR) -t splitsoftware/splitd-sidecar-fips:latest -t splitsoftware/splitd-sidecar-fips:$(VERSION) \
88-
--build-arg FIPS_MODE=1 --build-arg COMMIT_SHA=$(COMMIT_SHA) \
88+
--build-arg FIPS_MODE=enabled --build-arg COMMIT_SHA=$(COMMIT_SHA) \
8989
-f infra/sidecar.Dockerfile .
9090
@echo "Image created. Make sure everything works ok, and then run the following commands to push them."
9191
@echo "$(DOCKER) push splitsoftware/splitd-sidecar:latest"

0 commit comments

Comments
 (0)