From cfa8de2fb1927bd9e1642cfa0c42156305e99463 Mon Sep 17 00:00:00 2001 From: Roy Golan Date: Wed, 11 Sep 2024 14:32:03 +0300 Subject: [PATCH] Drop the global build-arg QUARKUS_EXTENSIONS from the makefile Workflows were missing persistency since the introduction of build-arg usage in the makefile. This is not really used and sending an empty value override the value in argfile. Removing as this is not used and is too clever. Signed-off-by: Roy Golan --- Makefile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 091d7c4a..77f547c5 100644 --- a/Makefile +++ b/Makefile @@ -24,9 +24,6 @@ $(WORKFLOWS): # Empty value is used to work with the default builder image from the dockerfile. BUILDER_IMAGE = "" -# Empty value is used to work with the default quarkus extensions list from the dockerfile. -QUARKUS_EXTENSIONS = "" - ifndef APPLICATION_ID APPLICATION_ID = UNDEFINED endif @@ -126,7 +123,7 @@ prepare-workdir: # Depends on: prepare-workdir target. # Usage: make build-image ifeq ($(IS_WORKFLOW),true) -build-image: BUILD_ARGS=--build-arg-file=$(WORKFLOW_ID)/argfile.conf --build-arg=BUILDER_IMAGE=$(BUILDER_IMAGE) --build-arg=QUARKUS_EXTENSIONS=$(QUARKUS_EXTENSIONS) --build-arg WF_RESOURCES=$(WORKFLOW_ID) +build-image: BUILD_ARGS=--build-arg-file=$(WORKFLOW_ID)/argfile.conf --build-arg=BUILDER_IMAGE=$(BUILDER_IMAGE) --build-arg WF_RESOURCES=$(WORKFLOW_ID) endif build-image: EXTRA_ARGS=--ulimit nofile=4096:4096 build-image: prepare-workdir