make producer aggregator work with new base image

smithy-security · Sep 12, 2024 · 0a4e840 · 0a4e840
1 parent 9aed2ca
commit 0a4e840
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 4 deletions.
diff --git a/components/producers/aggregator/Dockerfile b/components/producers/aggregator/Dockerfile
@@ -1,5 +1,5 @@
-ARG PRODUCER_AGGREGATOR_BASE_IMAGE
-FROM ${PRODUCER_AGGREGATOR_BASE_IMAGE}
+ARG BASE_IMAGE
+FROM ${BASE_IMAGE:-scratch}
 
 COPY ./components/producers/aggregator/aggregator-parser /app/components/producers/aggregator/tagger
 

diff --git a/components/producers/aggregator/Makefile b/components/producers/aggregator/Makefile
@@ -3,15 +3,14 @@
 CONTAINER_REPO=
 DRACON_VERSION=
 SOURCE_CODE_REPO=
-PRODUCER_AGGREGATOR_BASE_IMAGE=$(shell test -e .custom_image && cat .custom_image || echo "scratch")
 
 DOCKER=docker
 
 container:
 	$(DOCKER) build --tag $(CONTAINER_REPO)/components/producers/tagger:$(DRACON_VERSION) \
 					--file Dockerfile \
 					$$([ "${SOURCE_CODE_REPO}" != "" ] && echo "--label=org.opencontainers.image.source=${SOURCE_CODE_REPO}" ) \
-					--build-arg PRODUCER_AGGREGATOR_BASE_IMAGE=$(PRODUCER_AGGREGATOR_BASE_IMAGE) ../../../bin 1>&2
+					--build-arg BASE_IMAGE=$(BASE_IMAGE) ../../../bin 1>&2
 
 publish:
 	$(DOCKER) push $(CONTAINER_REPO)/components/producers/tagger:$(DRACON_VERSION) 1>&2