From a2794baa45475be9b50cd9e8323c930317e18d99 Mon Sep 17 00:00:00 2001 From: Pavlos Tzianos Date: Fri, 13 Sep 2024 14:38:57 +0100 Subject: [PATCH] simplify producer aggregator build --- components/producers/aggregator/Dockerfile | 6 ------ components/producers/aggregator/Makefile | 7 ++++--- 2 files changed, 4 insertions(+), 9 deletions(-) delete mode 100644 components/producers/aggregator/Dockerfile diff --git a/components/producers/aggregator/Dockerfile b/components/producers/aggregator/Dockerfile deleted file mode 100644 index 424d64e69..000000000 --- a/components/producers/aggregator/Dockerfile +++ /dev/null @@ -1,6 +0,0 @@ -ARG BASE_IMAGE -FROM ${BASE_IMAGE:-scratch} - -COPY ./components/producers/aggregator/aggregator-parser /app/components/producers/aggregator/tagger - -ENTRYPOINT ["/app/components/producers/aggregator/tagger"] diff --git a/components/producers/aggregator/Makefile b/components/producers/aggregator/Makefile index bd0fdaa48..8009b1350 100644 --- a/components/producers/aggregator/Makefile +++ b/components/producers/aggregator/Makefile @@ -7,10 +7,11 @@ SOURCE_CODE_REPO= DOCKER=docker container: - $(DOCKER) build --tag $(CONTAINER_REPO)/components/producers/tagger:$(DRACON_VERSION) \ - --file Dockerfile \ + $(DOCKER) --debug build --tag $(CONTAINER_REPO)/components/producers/tagger:$(DRACON_VERSION) \ + --build-arg EXECUTABLE_SRC_PATH=components/producers/aggregator/aggregator-parser \ + --build-arg EXECUTABLE_TARGET_PATH=components/producers/aggregator/tagger \ $$([ "${SOURCE_CODE_REPO}" != "" ] && echo "--label=org.opencontainers.image.source=${SOURCE_CODE_REPO}" ) \ - --build-arg BASE_IMAGE=$(BASE_IMAGE) ../../../bin 1>&2 + --file ${BASE_IMAGE_PATH} ../../../bin 1>&2 publish: $(DOCKER) push $(CONTAINER_REPO)/components/producers/tagger:$(DRACON_VERSION) 1>&2