Skip to content

Commit

Permalink
Drop the global build-arg QUARKUS_EXTENSIONS from the makefile
Browse files Browse the repository at this point in the history
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 <[email protected]>
  • Loading branch information
rgolangh committed Sep 11, 2024
1 parent 60c7b89 commit cfa8de2
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit cfa8de2

Please sign in to comment.