From a7030b857c90f063879bdd05b5c56a0813b49eb9 Mon Sep 17 00:00:00 2001
From: sg <spyros@ocurity.com>
Date: Thu, 12 Sep 2024 20:26:52 +0100
Subject: [PATCH] make producer aggregator work with new base image

---
 components/producers/aggregator/Dockerfile | 4 ++--
 components/producers/aggregator/Makefile   | 3 +--
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/components/producers/aggregator/Dockerfile b/components/producers/aggregator/Dockerfile
index 3f74d3b26..424d64e69 100644
--- 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
index bc174363f..bd0fdaa48 100644
--- a/components/producers/aggregator/Makefile
+++ b/components/producers/aggregator/Makefile
@@ -3,7 +3,6 @@
 CONTAINER_REPO=
 DRACON_VERSION=
 SOURCE_CODE_REPO=
-PRODUCER_AGGREGATOR_BASE_IMAGE=$(shell test -e .custom_image && cat .custom_image || echo "scratch")
 
 DOCKER=docker
 
@@ -11,7 +10,7 @@ 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