From fab24a5edf1341b273abac9ffc3e2546a557fa2c Mon Sep 17 00:00:00 2001 From: Nianyu Shen Date: Fri, 4 Oct 2024 13:01:39 -0700 Subject: [PATCH] fix fips image build (#288) Signed-off-by: Nianyu Shen --- Earthfile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Earthfile b/Earthfile index e80b4e0..b3df955 100644 --- a/Earthfile +++ b/Earthfile @@ -1,4 +1,4 @@ -VERSION 0.6 +VERSION --arg-scope-and-set --shell-out-anywhere 0.6 ARG TARGETOS ARG TARGETARCH @@ -9,9 +9,9 @@ ARG ALPINE_IMG=$SPECTRO_PUB_REPO/edge/canvos/alpine:$ALPINE_TAG FROM $ALPINE_IMG ARG FIPS_ENABLED=false -IF [ "$FIPS_ENABLED" = "true" ] - ARG SPECTRO_PUB_REPO=us-docker.pkg.dev/palette-images-fips - ARG ALPINE_IMG=$SPECTRO_PUB_REPO/edge/canvos/alpine:$ALPINE_TAG +IF [ "$FIPS_ENABLED" = "true" ] && [ "$SPECTRO_PUB_REPO" = "us-docker.pkg.dev/palette-images" ] + LET SPECTRO_PUB_REPO=us-docker.pkg.dev/palette-images-fips + LET ALPINE_IMG=$SPECTRO_PUB_REPO/edge/canvos/alpine:$ALPINE_TAG END ARG SPECTRO_LUET_REPO=us-docker.pkg.dev/palette-images/edge